Feature/dependency updates (#11)

Rolf-Smit · web-flow · commit d5d025f83601 · 2019-04-24T09:24:24.000+02:00
- Update Kotlin to version 1.3.30
- Update Espresso to version 3.1.0
- Update Google Truth to version 0.44
- Migrate to AndroidX
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: "com.github.ben-manes.versions"
+
 buildscript {
 
     // Import versions
@@ -8,6 +10,10 @@ buildscript {
         google()
         jcenter()
     }
+
+    dependencies {
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
+    }
 }
 
 allprojects {
@@ -19,4 +25,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,32 +1,35 @@
 ext {
     projectVersion = [
-            minSdk      : 19,
-            targetSdk   : 28,
-            compileSdk  : 28,
-            kotlin      : "1.3.11"
+            minSdk    : 19,
+            targetSdk : 28,
+            compileSdk: 28,
+            kotlin    : "1.3.30"
     ]
     projectDependency = [
 
             // Gradle Plugins
-            kotlinPlugin        : "org.jetbrains.kotlin:kotlin-gradle-plugin:${projectVersion.kotlin}",
-            androidGradlePlugin : "com.android.tools.build:gradle:3.3.0",
+            kotlinPlugin       : "org.jetbrains.kotlin:kotlin-gradle-plugin:${projectVersion.kotlin}",
+            androidGradlePlugin: "com.android.tools.build:gradle:3.3.0",
 
             // Dependencies
-            kotlinStdlibJdk7    : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${projectVersion.kotlin}",
-            appCompat           : "com.android.support:appcompat-v7:28.0.0",
+            kotlinStdlibJdk7   : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${projectVersion.kotlin}",
+            appCompat          : "androidx.appcompat:appcompat:1.0.0",
 
             // Test dependencies
-            junit               : "junit:junit:4.12",
-            truth               : "com.google.truth:truth:0.42",
-            supportTestRunner   : "com.android.support.test:runner:1.0.2",
-            espressoCore        : "com.android.support.test.espresso:espresso-core:3.0.2",
-            commonsCsv          : "org.apache.commons:commons-csv:1.6",
-            kotlinTest          : "org.jetbrains.kotlin:kotlin-test:${projectVersion.kotlin}"
+            junit              : "junit:junit:4.12",
+            truth              : "com.google.truth:truth:0.44",
+            supportTestRunner  : "androidx.test:runner:1.1.0",
+            espressoCore       : "androidx.test.espresso:espresso-core:3.1.0",
+            commonsCsv         : "org.apache.commons:commons-csv:1.6",
+            kotlinTest         : "org.jetbrains.kotlin:kotlin-test:${projectVersion.kotlin}"
     ]
 
     // Used by the plugin-version-handler.gradle
     pluginVersions = [
-            "org.jetbrains.kotlin.android": "${projectVersion.kotlin}",
-            "org.jetbrains.kotlin.jvm": "${projectVersion.kotlin}"
+            "org.jetbrains.kotlin.android"      : "${projectVersion.kotlin}",
+            "org.jetbrains.kotlin.jvm"          : "${projectVersion.kotlin}",
+            "com.jfrog.bintray"                 : "1.8.4",
+            "com.github.dcendents.android-maven": "2.1",
+            "com.gradle.plugin-publish"         : "0.10.1"
     ]
 }
diff --git a/gradle/plugin-version-handler.gradle b/gradle/plugin-version-handler.gradle
@@ -37,6 +37,10 @@ resolutionStrategy {
         def version = pluginVersions[requested.id.id]
         if (requested.version == null && version != null) {
             useVersion version
+        } else if(requested.version == null) {
+            logger.log(LogLevel.WARN, "Plugin with id `${requested.id.id}` is requested without version and no version can be found in the `pluginVersions` map!")
+        } else {
+            logger.log(LogLevel.WARN, "Plugin with id `${requested.id.id}` is not defined in the `pluginVersions` map, using version ${requested.version}")
         }
     }
 }
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -2,12 +2,10 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
     id "java-gradle-plugin"
 
-    // For publishing to Plugin Portal
-    id "com.gradle.plugin-publish" version "0.10.0"
-
-    // Bintray & Maven for publishing
-    id "com.github.dcendents.android-maven" version "2.1"
-    id "com.jfrog.bintray" version "1.8.4"
+    // For publishing to Plugin Portal & Bintray
+    id "com.gradle.plugin-publish"
+    id "com.github.dcendents.android-maven"
+    id "com.jfrog.bintray"
 }
 
 // To upload new plugin artifact to maven and Gradle Portal:
@@ -68,4 +66,4 @@ dependencies {
     testImplementation projectDependency.commonsCsv
 }
 
-apply from: rootProject.file('publish.gradle')
+apply from: rootProject.file('publish.gradle')
diff --git a/plugin/src/test/test-fixtures/multi-module/app/build.gradle b/plugin/src/test/test-fixtures/multi-module/app/build.gradle
@@ -18,7 +18,7 @@ android {
         targetSdkVersion projectVersion.compileSdk
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/plugin/src/test/test-fixtures/multi-module/app/src/androidTest/java/org/neotech/app/multimoduleapplication/TouchLibraryCodeTest.kt b/plugin/src/test/test-fixtures/multi-module/app/src/androidTest/java/org/neotech/app/multimoduleapplication/TouchLibraryCodeTest.kt
@@ -1,6 +1,6 @@
 package org.neotech.app.multimoduleapplication
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.runner.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/plugin/src/test/test-fixtures/multi-module/app/src/main/java/org/neotech/app/MainActivity.kt b/plugin/src/test/test-fixtures/multi-module/app/src/main/java/org/neotech/app/MainActivity.kt
@@ -1,7 +1,7 @@
 package org.neotech.app
 
 import android.annotation.SuppressLint
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.TextView
 import org.neotech.library.android.LibraryAndroidKotlin
@@ -14,4 +14,4 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         findViewById<TextView>(R.id.text).text = "${LibraryAndroidKotlin.getName()}"
     }
-}
+}
diff --git a/plugin/src/test/test-fixtures/multi-module/library_android/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_android/build.gradle
@@ -18,7 +18,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
diff --git a/plugin/src/test/test-fixtures/multi-module/library_android/src/androidTest/java/org/neotech/library/android/LibraryAInstrumentedTest.java b/plugin/src/test/test-fixtures/multi-module/library_android/src/androidTest/java/org/neotech/library/android/LibraryAInstrumentedTest.java
@@ -1,6 +1,6 @@
 package org.neotech.library.android;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/publish.gradle b/publish.gradle
@@ -60,24 +60,24 @@ if (project.getPlugins().hasPlugin('com.android.application') || project.getPlug
     }
 
     task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-        classifier = 'javadoc'
+        getArchiveClassifier().set('javadoc')
         from androidJavadocs.destinationDir
     }
 
     task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
+        getArchiveClassifier().set('sources')
         from android.sourceSets.main.java.source
     }
 
 } else {
     // Java libraries
-    task sourcesJar(type: Jar, dependsOn:classes) {
-        classifier = 'sources'
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        getArchiveClassifier().set('sources')
         from sourceSets.main.allSource
     }
 
-    task javadocJar(type: Jar, dependsOn:javadoc) {
-        classifier = 'javadoc'
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        getArchiveClassifier().set('javadoc')
         from javadoc.destinationDir
     }
 }
@@ -113,10 +113,10 @@ bintray {
         version {
             name = VERSION
             vcsTag = VERSION
-            released = new Date();
+            released = new Date()
         }
     }
 }
 
 // Make sure clean and install are executed before upload.
-bintrayUpload.dependsOn clean, install
+bintrayUpload.dependsOn clean, install

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ resolutionStrategy {`
`37`	`37`	`def version = pluginVersions[requested.id.id]`
`38`	`38`	`if (requested.version == null && version != null) {`
`39`	`39`	`useVersion version`
	`40`	`+ } else if(requested.version == null) {`
	`41`	+ logger.log(LogLevel.WARN, "Plugin with id `${requested.id.id}` is requested without version and no version can be found in the `pluginVersions` map!")
	`42`	`+ } else {`
	`43`	+ logger.log(LogLevel.WARN, "Plugin with id `${requested.id.id}` is not defined in the `pluginVersions` map, using version ${requested.version}")
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ android {`
`18`	`18`	`targetSdkVersion projectVersion.compileSdk`
`19`	`19`	`versionCode 1`
`20`	`20`	`versionName "1.0"`
`21`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`21`	`+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`buildTypes {`
Original file line number	Diff line number	Diff line change
`@@ -60,24 +60,24 @@ if (project.getPlugins().hasPlugin('com.android.application') \|\| project.getPlug`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {`
`63`		`- classifier = 'javadoc'`
	`63`	`+ getArchiveClassifier().set('javadoc')`
`64`	`64`	`from androidJavadocs.destinationDir`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`task androidSourcesJar(type: Jar) {`
`68`		`- classifier = 'sources'`
	`68`	`+ getArchiveClassifier().set('sources')`
`69`	`69`	`from android.sourceSets.main.java.source`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`} else {`
`73`	`73`	`// Java libraries`
`74`		`- task sourcesJar(type: Jar, dependsOn:classes) {`
`75`		`- classifier = 'sources'`
	`74`	`+ task sourcesJar(type: Jar, dependsOn: classes) {`
	`75`	`+ getArchiveClassifier().set('sources')`
`76`	`76`	`from sourceSets.main.allSource`
`77`	`77`	`}`
`78`	`78`
`79`		`- task javadocJar(type: Jar, dependsOn:javadoc) {`
`80`		`- classifier = 'javadoc'`
	`79`	`+ task javadocJar(type: Jar, dependsOn: javadoc) {`
	`80`	`+ getArchiveClassifier().set('javadoc')`
`81`	`81`	`from javadoc.destinationDir`
`82`	`82`	`}`
`83`	`83`	`}`
`@@ -113,10 +113,10 @@ bintray {`
`113`	`113`	`version {`
`114`	`114`	`name = VERSION`
`115`	`115`	`vcsTag = VERSION`
`116`		`- released = new Date();`
	`116`	`+ released = new Date()`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`// Make sure clean and install are executed before upload.`
`122`		`-bintrayUpload.dependsOn clean, install`
	`122`	`+bintrayUpload.dependsOn clean, install`