Reorganize deps and versions; make necessary update

canelmas · Sep 3, 2017 · 042e7b3 · 042e7b3
1 parent 3d3fbb9
commit 042e7b3
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,34 +1,46 @@
 buildscript {
 
+    ext.versions = [
+            compileSdkVersion : 26,
+            buildToolsVersion : '26.0.1',
+            minSdkVersion     : 14,
+            targetSdkVersion  : 26,
+            supportLibrary    : '26.0.1',
+            aspectjrt         : '1.8.10',
+            aspectjtools      : '1.8.9',
+            androidPlugin     : '3.0.0-beta4',
+            androidMavenPlugin: '1.2'
+    ]
+
+    ext.deps = [
+            supportAnnotations : "com.android.support:support-annotations:${versions.supportLibrary}",
+            supportDesign      : "com.android.support:design:${versions.supportLibrary}",
+            appCompatv7        : "com.android.support:appcompat-v7:${versions.supportLibrary}",
+            aspectjrt          : "org.aspectj:aspectjrt:${versions.aspectjrt}",
+            aspectjtools       : "org.aspectj:aspectjtools:${versions.aspectjtools}",
+            androidGradlePlugin: "com.android.tools.build:gradle:${versions.androidPlugin}",
+            androidMavenPlugin : "com.github.dcendents:android-maven-plugin:${versions.androidMavenPlugin}",
+            junit              : 'junit:junit:4.12'
+    ]
+
     repositories {
         jcenter()
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath deps.androidGradlePlugin
         classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 
     group = GROUP
     version = VERSION_NAME
 }
-
-ext {
-    compileSdkVersion = 23
-    buildToolsVersion = '22.0.1'
-    minSdkVersion = 10
-    targetSdkVersion = 23
-}
-
-ext.deps = [
-        supportAnnotations : 'com.android.support:support-annotations:23.0.1',
-        supportDesign : 'com.android.support:design:23.0.1',
-        appCompatv7 : 'com.android.support:appcompat-v7:23.0.1',
-]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/let-plugin/build.gradle b/let-plugin/build.gradle
@@ -23,9 +23,9 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile 'com.android.tools.build:gradle:1.3.0'
-    compile 'org.aspectj:aspectjtools:1.8.6'
-    compile 'org.aspectj:aspectjrt:1.8.6'
+    compile deps.androidGradlePlugin
+    compile deps.aspectjtools
+    compile deps.aspectjrt
 }
 
 modifyPom {

diff --git a/let-runtime/build.gradle b/let-runtime/build.gradle
@@ -23,8 +23,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.aspectj:aspectjtools:1.8.6'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath deps.aspectjtools
+        classpath deps.androidMavenPlugin
     }
 }
 
@@ -33,21 +33,21 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply from: '../gradle-mvn-push.gradle'
 
 dependencies {
-    compile 'org.aspectj:aspectjrt:1.8.6'
+    compile deps.aspectjrt
     compile project(':let-annotations')
 
     compile deps.appCompatv7
     compile deps.supportAnnotations
 
-    testCompile 'junit:junit:4.12'
+    testCompile deps.junit
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion versions.compileSdkVersion
+    buildToolsVersion versions.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
+        minSdkVersion versions.minSdkVersion
     }
 
     compileOptions {

diff --git a/let-sample/build.gradle b/let-sample/build.gradle
@@ -34,13 +34,13 @@ repositories {
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion versions.compileSdkVersion
+    buildToolsVersion versions.buildToolsVersion
 
     defaultConfig {
         applicationId "com.canelmas.let.sample"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion versions.minSdkVersion
+        targetSdkVersion versions.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -64,7 +64,7 @@ dependencies {
     compile deps.appCompatv7
     compile deps.supportDesign
 
-    testCompile 'junit:junit:4.12'
+    testCompile deps.junit
 
-    compile 'com.android.tools:annotations:24.3.0'
+//    compile 'com.android.tools:annotations:24.3.0'
 }