Merge pull request #83 from plastiv/update_deps

Update build dependencies
trevjonez · May 23, 2021 · a56f0a1 · a56f0a1
2 parents e834710 + 253af15
commit a56f0a1
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Items listed here may not be exhaustive, if you are seeing issues, check the git
 ## 1.0.0-rc09
 - Formatting and some top-level elements have been moved in commander/composer
 - Invoke composer within the project build directory
+- Update to Gradle 6.9, AGP 4.2.1, Kotlin 1.4.32, detekt 1.14.2
 
 ## 1.0.0-rc08
 - Support for ANDROID_SDK_ROOT falling back to ANDROID_HOME and warning when appropriate

diff --git a/README.md b/README.md
@@ -193,6 +193,7 @@ Composer plugin version | Gradle version | Android plugin version
 | 0.13.0     | 5.6                | 3.4.2, 3.5.0-rc01<sup>\*</sup>, 3.6.0-alpha05<sup>\*</sup> |
 | 1.0.0-rc07 | 6.4                | 3.6.2, 4.0.0-beta04<sup>\*</sup>, 4.1.0-alpha05<sup>\*</sup> |
 | 1.0.0-rc08 | 6.6.1              | 4.0.1, 4.1.0-rc01<sup>\*</sup>, 4.2.0-alpha07<sup>\*</sup> |
+| 1.0.0-rc09 | 6.9             | 4.2.1, 7.0.0-beta02<sup>\*</sup>, 7.1.0-alpha01<sup>\*</sup> |
 
 \* Alpha, Beta and RC versions of the android plugin are quickly tested by building against them.
 This usually means the published composer plugin will work with those version 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ buildscript {
   }
   dependencies {
     val KOTLIN_VERSION: String by rootProject
-    classpath("org.gradle.kotlin:plugins:1.3.6")
+    classpath("org.gradle.kotlin:gradle-kotlin-dsl-plugins:1.4.9")
     classpath("com.gradle.publish:plugin-publish-plugin:0.11.0")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION")
     classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
@@ -35,7 +35,7 @@ buildscript {
 
 plugins {
   `build-dashboard`
-  id("io.gitlab.arturbosch.detekt").version("1.12.0").apply(false)
+  id("io.gitlab.arturbosch.detekt").version("1.14.2").apply(false)
 }
 
 allprojects {
@@ -49,7 +49,7 @@ allprojects {
 
   apply(plugin = "io.gitlab.arturbosch.detekt")
   dependencies {
-    add("detektPlugins", "io.gitlab.arturbosch.detekt:detekt-formatting:1.12.0")
+    add("detektPlugins", "io.gitlab.arturbosch.detekt:detekt-formatting:1.14.2")
   }
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,9 +1,7 @@
-import io.gitlab.arturbosch.detekt.detekt
-
 plugins {
   `kotlin-dsl`
   `java-gradle-plugin`
-  id("io.gitlab.arturbosch.detekt").version("1.12.0")
+  id("io.gitlab.arturbosch.detekt").version("1.14.2")
 }
 
 repositories {
@@ -21,9 +19,5 @@ gradlePlugin {
 }
 
 dependencies {
-  detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.12.0")
+  detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.14.2")
 }
-
-kotlinDslPluginOptions {
-  experimentalWarning.set(false)
-}
diff --git a/commander/android/src/test/kotlin/com/gojuno/commander/android/AdbSpec.kt b/commander/android/src/test/kotlin/com/gojuno/commander/android/AdbSpec.kt
@@ -13,12 +13,15 @@ import java.io.ByteArrayOutputStream
 import java.io.PrintStream
 import java.nio.channels.OverlappingFileLockException
 import java.util.concurrent.TimeUnit.SECONDS
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.createTempFile
 
+@ExperimentalPathApi
 class AdbSpec : Spek({
 
                        describe("process exit notification output") {
 
-                         val file = createTempFile().apply {
+                         val file = createTempFile().toFile().apply {
                            deleteOnExit()
                            writeText("\ttest \n")
                          }

diff --git a/commander/testSupport/build.gradle.kts b/commander/testSupport/build.gradle.kts
@@ -16,9 +16,6 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions("version")
-    variantFilter {
-        ignore = buildType.name == "release"
-    }
     productFlavors {
         create("older") {
             dimension = "version"
@@ -32,3 +29,10 @@ android {
         manifest.srcFile(file("AndroidManifest.xml"))
     }
 }
+
+androidComponents {
+    val release = selector().withBuildType("release")
+    beforeVariants(release) { variant ->
+        variant.enabled = false
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -18,14 +18,15 @@ group=com.trevjonez.composer
 
 CGP_VERSION=1.0.0-rc09
 
-AGP_VERSION=4.0.1
-#AGP_VERSION=4.1.0-rc01
-#AGP_VERSION=4.2.0-alpha07
+#AGP_VERSION=4.1.3
+AGP_VERSION=4.2.1
+#AGP_VERSION=7.0.0-beta02
+#AGP_VERSION=7.1.0-alpha01
 
 MIN_SDK=23
 COMPILE_SDK=29
 
-KOTLIN_VERSION=1.3.72
+KOTLIN_VERSION=1.4.32
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -155,7 +155,3 @@ tasks.named("publishPlugins") {
   dependsOn(":commander:android:bintrayUpload")
   dependsOn(":composer:bintrayUpload")
 }
-
-kotlinDslPluginOptions {
-  experimentalWarning.set(false)
-}