Merge pull request #5 from RichRelevance/gradle_support

Upgrade support for Gradle 4.4
RichRelevance · May 11, 2018 · 604d40a · 604d40a
2 parents 6ae5a59 + 6822e35
commit 604d40a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.1'
 
         // Bintray
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
@@ -18,5 +19,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,5 @@
-
-#Mon Oct 24 20:48:16 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/richrelevance/build.gradle b/richrelevance/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -29,16 +29,16 @@ android.libraryVariants.all { variant ->
 
         title = "Rich Relevance"
 
-        options.links("http://docs.oracle.com/javase/7/docs/api/");
-        options.linksOffline("http://d.android.com/reference", "${android.sdkDirectory}/docs/reference");
-
-        // First add all of your dependencies to the classpath, then add the android jars
-        classpath += files(variant.javaCompile.classpath.files)
-        classpath += files(android.getBootClasspath())
+        options.links("http://docs.oracle.com/javase/7/docs/api/")
+        options.linksOffline("http://d.android.com/reference", "${android.sdkDirectory}/docs/reference")
 
         // We're excluding these generated files
         exclude '**/BuildConfig.java'
         exclude '**/R.java'
+        doFirst {
+            // First add all of your dependencies to the classpath, then add the android jars
+            classpath = files(variant.javaCompile.classpath.files, android.getBootClasspath())
+        }
     }
 }
 
@@ -49,10 +49,10 @@ android.libraryVariants.all { variant ->
     }
 
     // Add the Javadoc jar to the project's artifacts. This will allow us to upload it easily later
-    project.artifacts.add("archives", tasks["${variant.name}JavadocJar"]);
+    project.artifacts.add("archives", tasks["${variant.name}JavadocJar"])
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-annotations:23+'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:support-annotations:27.1.1'
 }
diff --git a/testApp/build.gradle b/testApp/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "com.richrelevance.testApp"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -20,13 +20,12 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:recyclerview-v7:23.3.0'
-    compile 'com.android.support:cardview-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.github.arimorty:floatingsearchview:2.0.3'
-    compile 'com.github.satyan:sugar:1.4'
-
-    compile project(':richrelevance')
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.github.arimorty:floatingsearchview:2.0.3'
+    implementation 'com.github.satyan:sugar:1.4'
+    implementation project(':richrelevance')
 }