From 2e25568544cffa3238d42307349f741afdcd73b4 Mon Sep 17 00:00:00 2001 From: keyboardsurfer Date: Fri, 11 Jul 2014 10:39:32 +0200 Subject: [PATCH 1/2] updates gradle wrapper, build tools version and plugin names --- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 4 ++-- sample/build.gradle | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 56a526e..90cfc91 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ version = '1.8.5' } dependencies { - classpath 'com.android.tools.build:gradle:0.11.1' + classpath 'com.android.tools.build:gradle:0.12.0' classpath 'com.github.dcendents:android-maven-plugin:1.0' } } @@ -36,6 +36,6 @@ version = '1.8.5' } task wrapper(type: Wrapper) { - description "Generates the gradle wrapper" - gradleVersion = "1.12" + description 'Generates the gradle wrapper' + gradleVersion = '1.12' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a41c59a..7ae602f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 24 02:33:49 CEST 2014 +#Fri Jul 11 10:05:20 CEST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/library/build.gradle b/library/build.gradle index 03a099c..c6c6878 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -apply plugin: 'android-library' +apply plugin: 'com.android.library' apply plugin: 'android-maven' apply plugin: 'signing' @@ -22,7 +22,7 @@ dependencies { } android { - buildToolsVersion '19.1.0' + buildToolsVersion '20.0.0' compileSdkVersion 19 defaultConfig { versionCode 7 diff --git a/sample/build.gradle b/sample/build.gradle index 0082669..6f17d63 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -apply plugin: 'android' +apply plugin: 'com.android.application' buildscript { repositories { @@ -33,14 +33,14 @@ repositories { dependencies { compile project(':crouton-library') compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' - compile 'com.android.support:support-v4:19.1.+' - compile('com.viewpagerindicator:library:2.4.2-SNAPSHOT') { + compile 'com.android.support:support-v4:19.1.0' + compile('com.viewpagerindicator:library:2.4.2-SNAPSHOT@aar') { exclude group: 'com.google.android', module: 'support-v4' } } android { - buildToolsVersion '19.1.0' + buildToolsVersion '20.0.0' compileSdkVersion 19 defaultConfig { From 8a7693ceee9547a516efd1c7e60f90c33a28e2a6 Mon Sep 17 00:00:00 2001 From: keyboardsurfer Date: Fri, 11 Jul 2014 10:41:36 +0200 Subject: [PATCH 2/2] unification, improved jar bundling --- gradle/wrapper/gradle-wrapper.jar | Bin 50557 -> 51348 bytes library/build.gradle | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5838598129719e795cc5633f411468bdec311016..0087cd3b18659b5577cf6ad3ef61f8eb9416ebba 100644 GIT binary patch delta 19944 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 YGgPG9ossn)S*P`JoiNavnaI1p09p_|b^rhX delta 19013 zcmZ6yV{|6n7A>4kI<{@wNyoNr+fK(%$F}vvwr$(CZL`1kocG@GjdOqPIjYvKQMLE1 zwN}lwDk&c9D*_BbQ3mWM3r2et{U(f&#>I#bRACr?yO_y>I5ReU!#948i#Im3L{~BOGDMS2= zY!OO8|3#R{jNtzwX$)=1e^Dtu4dTCOnGW{*cbyO3$L8>3dP`HBA#AmOm zfej5@Ue*d%MjMZ{+7-`@&r$0Ps^xX5&Ck_cHy^bxzB+#$%(b4=@Or-ga6W8*Z2#@( zxq*)rc-kERVL;!A5U*4fF9zP~J+R=kyoQ5Db){`-t})&@}Hg(C~-OeB6P19!L85NcE*2U1%I0qdGrSpqxSr zbW`|uUypF2`KX*b3nT2@ADF*=HWThB-Rb!#^u2t&`tyE@pbPZJ9^Im%3k=PCzP2?& zQUi!{dgw};dz5brBaE_c4_5Bqa0UEmb9zt#rB|2h3;cN4+#W-M-WG)yySIiby?tH2 zA00nI<87Wuy?#|wQuGHlqsz!PLRV51@~o~1EN-pPDy|t(Bs2qSB_2J-k)Y6(+}+`u zeoM4-H%O>s#y=uHKK+J=i^jh^!zpkS`_Stmy;fhF)+8~%L7^&hz(T%tOFKAhBSVn^ zV0D$1iG;8h5=P)EL$j8TNVw8coTQ88@L|iq*hZu+i+c3Wj~s}a>ov`@tUAsnGHhqXUhZwUZKqv$exxou$ocB&tvs zS&?p`k;kNvK6AOMurKwg%~|}Q&M}k=z+OZ-TvY#s0PjCuV7?FKf9P))3<(iSX=hR{ zFhK*EYx0f7jOMZ)GZ#rfhtGe&bt0*sO!ucKT=z@aosK|XGu5kIa{$e~hKpP;nOSCq znKYwbPP(ga0>9u*bsnfUl0V#;we?C*bMY{hC6Gv`C9uj zDC`DMLT?qSLgIUFhUx1kDbwEr3PVJ~tke2o**C***<=qO)T0}M+e3B^5Et8K8Q28= zmTwkJQ7dyO%y-~?hY3)>HiY!-)`05#jUAl5<^0qe5V%zU|2u!{@F_6>xI_D@MY{NS zvV#9x;Om6fV(CEutbr!Rpw1UXA>QNtKNDF)E%2b!MtjSh*p74u9GJY8- zuIu4@kr=J#IR&Pq<^L6#YX!>6FO=pD6r+!a;TmHj;x|v0DJJ2c!~xla-Eb4#=sl6w zexGWSTH6>GtdempTjlH5!-iyE+B9!IPOvHjS{7<}PsNF#jK>85j#)EF3Q-OYl@HVm z*yqSNZ1T0@c8!fq&qb*A(83g**TaSpMxyQ%>6~yrF~ow{oqpugl@XBp1233VcvBtn zJTpySn=K>XebyccSe{Ou&u7nVGQ78SsT{0S%yAzc;P�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 def name = variant.buildType.name @@ -46,15 +46,15 @@ android.libraryVariants.all { variant -> return; // Skip debug builds. } task("javadoc${variant.name.capitalize()}", type: Javadoc) { - description "Generates Javadoc for $variant.name." + description 'Generates Javadoc for $variant.name.' source = variant.javaCompile.source - ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" + ext.androidJar = '${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar' classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) } task("bundleJavadoc${variant.name.capitalize()}", type: Jar) { - description "Bundles Javadoc into zip for $variant.name." - classifier = "javadoc" + description 'Bundles Javadoc into zip for $variant.name' + classifier = 'javadoc' from tasks["javadoc${variant.name.capitalize()}"] } @@ -62,11 +62,14 @@ android.libraryVariants.all { variant -> task sourcesJar(type: Jar) { classifier = 'sources' - from android.sourceSets.main.java + from android.sourceSets.main.java.srcDirs } task jar(type: Jar) { - from 'build/classes/release' + from 'build/intermediates/classes/release' + exclude '**/BuildConfig.class' + exclude '**/R.class' + exclude 'de/keyboardsurfer/mobile/' } task javadocJar(type: Jar, dependsOn: "javadocRelease") { @@ -82,6 +85,7 @@ artifacts { signing { sign configurations.archives + sign configurations.compile } uploadArchives {