Update more things

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false # We want to see all results
       matrix:
         java: ['8', '11']
-        agp: ['4.1.3', '4.2.0-rc01', '7.0.0-alpha14']
+        agp: ['4.2.1', '7.0.0-alpha14']
         tracerefs: [true, false]
         job: ['instrumentation', 'plugin']
         exclude:
@@ -77,12 +77,12 @@ jobs:
 
       - name: Reclaim memory
         run: ./gradlew --stop && jps|grep -E 'KotlinCompileDaemon|GradleDaemon'| awk '{print $1}'| xargs kill -9 || true
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.java == '8' && matrix.agp == '4.1.2' && matrix.tracerefs && matrix.job == 'plugin'
+        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.java == '8' && matrix.agp == '4.2.1' && matrix.tracerefs && matrix.job == 'plugin'
 
       - name: Upload snapshot (main only)
         env:
-          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SonatypeUsername }}
-          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SonatypePassword }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SonatypeUsername }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SonatypePassword }}
         run: |
           ./publish.sh --snapshot
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.java == '8' && matrix.agp == '4.1.3' && matrix.tracerefs && matrix.job == 'plugin'
+        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.java == '8' && matrix.agp == '4.2.1' && matrix.tracerefs && matrix.job == 'plugin'

build.gradle

@@ -23,10 +23,10 @@ buildscript {
         jcenter()
     }
 
-    String defaultAgpVersion = "4.1.3"
+    String defaultAgpVersion = "4.2.1"
     String agpVersion = findProperty("keeperTest.agpVersion")?.toString() ?: defaultAgpVersion
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
         classpath "com.android.tools.build:gradle:$agpVersion"
         classpath "com.slack.keeper:keeper"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

keeper-gradle-plugin/build.gradle.kts

@@ -20,37 +20,33 @@ import java.net.URL
 plugins {
   `kotlin-dsl`
   `java-gradle-plugin`
-  kotlin("jvm") version "1.4.32"
-  kotlin("kapt") version "1.4.32"
-  id("org.jetbrains.dokka") version "1.4.30"
-  id("com.vanniktech.maven.publish") version "0.14.2"
+  kotlin("jvm") version "1.5.0"
+  kotlin("kapt") version "1.5.0"
+  id("org.jetbrains.dokka") version "1.4.32"
+  id("com.vanniktech.maven.publish") version "0.15.1"
 }
 
 buildscript {
   repositories {
-    gradlePluginPortal()
     mavenCentral()
-    jcenter()
+    gradlePluginPortal()
   }
 }
 
 repositories {
   mavenCentral()
   google()
   gradlePluginPortal()
-  jcenter().mavenContent {
-    // Required for Dokka
-    includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
-    includeGroup("org.jetbrains.dokka")
-    includeModule("org.jetbrains", "markdown")
-  }
 }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlinOptions {
     jvmTarget = "1.8"
-    @Suppress("SuspiciousCollectionReassignment")
-    freeCompilerArgs += listOf("-progressive")
+    // Because Gradle's Kotlin handling is stupid
+    apiVersion = "1.4"
+    languageVersion = "1.4"
+//    @Suppress("SuspiciousCollectionReassignment")
+//    freeCompilerArgs += listOf("-progressive")
   }
 }
 
@@ -96,15 +92,15 @@ tasks.named<DokkaTask>("dokkaHtml") {
   }
 }
 
-val defaultAgpVersion = "4.1.2"
+val defaultAgpVersion = "4.2.1"
 val agpVersion = findProperty("keeperTest.agpVersion")?.toString() ?: defaultAgpVersion
 
 // See https://github.com/slackhq/keeper/pull/11#issuecomment-579544375 for context
 val releaseMode = hasProperty("keeper.releaseMode")
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
-  implementation("com.android:zipflinger:4.1.3")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.0")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
+  implementation("com.android:zipflinger:4.2.1")
 
   if (releaseMode) {
     compileOnly("com.android.tools.build:gradle:$defaultAgpVersion")

keeper-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-milestone-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

keeper-gradle-plugin/settings.gradle.kts

@@ -17,9 +17,8 @@
 pluginManagement {
   repositories {
     google()
-    gradlePluginPortal()
     mavenCentral()
-    jcenter()
+    gradlePluginPortal()
   }
 }