diff --git a/build.gradle b/build.gradle
index 3298d2d..81ff750 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,9 @@ group = GROUP
 version = VERSION_NAME
 description = POM_DESCRIPTION
 
-sourceCompatibility = JavaVersion.VERSION_11
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+}
 
 sourceSets {
     integrationTest
@@ -153,7 +155,7 @@ def integrationTest = tasks.register("integrationTest", Test) { t ->
     t.classpath = sourceSets.integrationTest.runtimeClasspath
 
     // Workaround for https://github.com/gradle/gradle/issues/4506#issuecomment-570815277
-    t.systemProperty("org.gradle.testkit.dir", file("${buildDir}/tmp/.test-kit"))
+    t.systemProperty("org.gradle.testkit.dir", file("build/tmp/.test-kit"))
 
     t.jvmArgs(
         "-XX:+HeapDumpOnOutOfMemoryError", "-XX:GCTimeLimit=20", "-XX:GCHeapFreeLimit=10",
@@ -264,35 +266,18 @@ signing {
 // Plugin Portal publishing
 
 gradlePlugin {
-    plugins {
-        dexcount {
-            id = "com.getkeepsafe.dexcount"
-            implementationClass = "com.getkeepsafe.dexcount.DexMethodCountPlugin"
-            displayName = POM_NAME
-            description = POM_DESCRIPTION
-        }
-    }
-}
-
-pluginBundle {
     website = POM_URL
     vcsUrl = POM_SCM_URL
-    description = POM_DESCRIPTION
-    tags = ['android', 'dex', 'method count']
 
     plugins {
         dexcount {
             id = "com.getkeepsafe.dexcount"
+            implementationClass = "com.getkeepsafe.dexcount.DexMethodCountPlugin"
             displayName = POM_NAME
             description = POM_DESCRIPTION
+            tags.set(["android", "dex", "method count"])
         }
     }
-
-    mavenCoordinates {
-        groupId = GROUP
-        artifactId = POM_ARTIFACT_ID
-        version = VERSION_NAME
-    }
 }
 
 // Convenient entrypoint for the "upload snapshot" CI action.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b13fd6d..4233837 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ groovy = "org.codehaus.groovy:groovy-all:3.0.9"
 spock = "org.spockframework:spock-core:2.1-groovy-3.0" # Don't forget to exclude groovy-all
 
 [plugins]
-mavenPublish = "com.vanniktech.maven.publish:0.20.0"
-gradlePluginPublish = "com.gradle.plugin-publish:0.21.0"
+mavenPublish = "com.vanniktech.maven.publish:0.25.3"
+gradlePluginPublish = "com.gradle.plugin-publish:1.2.1"
 thrifty = { id = "com.microsoft.thrifty", version.ref = "thrifty" }
 versions = "com.github.ben-manes.versions:0.42.0"