diff --git a/build.gradle b/build.gradle
index eb72ecf4..a067e856 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ subprojects {
   spotless {
     kotlin {
       ktfmt(libs.ktfmt.get().version).googleStyle()
-      target('**/*.kt')
+      target('src/**/*.kt')
     }
   }
 
@@ -35,6 +35,7 @@ subprojects {
         }
       }
       compilerOptions {
+        allWarningsAsErrors = true
         jvmTarget = JvmTarget.JVM_11
         freeCompilerArgs = [
             "-progressive",
@@ -48,21 +49,4 @@ subprojects {
   tasks.withType(JavaCompile).configureEach {
     options.release = 11
   }
-
-  configurations.configureEach {
-    resolutionStrategy.eachDependency {
-      if (requested.group == "com.android.tools.build" && requested.name == "aapt2-proto") {
-        useVersion(libs.versions.aapt2Proto.get())
-        because("We need to keep depenedencies in sync with bundletool")
-      }
-      if (requested.group == "com.google.protobuf" && requested.name == "protobuf-java") {
-        useVersion(libs.versions.protobufJava.get())
-        because("We need to keep depenedencies in sync with bundletool")
-      }
-      if (requested.group == "com.google.guava" && requested.name == "guava") {
-        useVersion(libs.versions.guava.get())
-        because("We need to keep depenedencies in sync with bundletool")
-      }
-    }
-  }
 }
diff --git a/diffuse/build.gradle b/diffuse/build.gradle
index 984fb6bc..90cd1797 100644
--- a/diffuse/build.gradle
+++ b/diffuse/build.gradle
@@ -30,12 +30,12 @@ buildConfig {
 }
 
 // A zip and tar are configured by default. We don't care about tar.
-tasks.named('distTar').configure { task ->
+tasks.named('distTar') { task ->
   task.enabled = false
 }
 
 // Build an exploded application directory by default for local testing.
-tasks.named('assemble').configure { task ->
+tasks.named('assemble') { task ->
   task.dependsOn(tasks.named('installDist'))
 }
 
diff --git a/formats/src/main/kotlin/com/jakewharton/diffuse/format/ApiMapping.kt b/formats/src/main/kotlin/com/jakewharton/diffuse/format/ApiMapping.kt
index bf2a76b1..656abac8 100644
--- a/formats/src/main/kotlin/com/jakewharton/diffuse/format/ApiMapping.kt
+++ b/formats/src/main/kotlin/com/jakewharton/diffuse/format/ApiMapping.kt
@@ -134,7 +134,7 @@ class ApiMapping private constructor(private val typeMappings: Map<TypeDescripto
           }
       }
       if (fromDescriptor != null) {
-        typeMappings[toDescriptor!!] = TypeMapping(fromDescriptor!!, fields!!, methods!!)
+        typeMappings[toDescriptor!!] = TypeMapping(fromDescriptor, fields!!, methods!!)
       }
       return ApiMapping(typeMappings)
     }
diff --git a/formats/src/main/kotlin/com/jakewharton/diffuse/format/Dex.kt b/formats/src/main/kotlin/com/jakewharton/diffuse/format/Dex.kt
index e5bbfc57..38e82daa 100644
--- a/formats/src/main/kotlin/com/jakewharton/diffuse/format/Dex.kt
+++ b/formats/src/main/kotlin/com/jakewharton/diffuse/format/Dex.kt
@@ -64,6 +64,7 @@ private fun AndroidDex.getMethod(methodId: MethodId): Method {
   val declaringType = TypeDescriptor(typeNames()[methodId.declaringClassIndex])
   val name = strings()[methodId.nameIndex]
   val methodProtoIds = protoIds()[methodId.protoIndex]
+  @OptIn(ExperimentalUnsignedTypes::class)
   val parameterTypes =
     readTypeList(methodProtoIds.parametersOffset).types.asUShortArray().map {
       TypeDescriptor(typeNames()[it.toInt()])
diff --git a/gradle.properties b/gradle.properties
index 4a218dd7..62883f20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,12 @@
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4g
+org.gradle.parallel=true
+org.gradle.tooling.parallel=true
+
+########## Properties for publishing to Maven Central ##########
+
 GROUP=com.jakewharton.diffuse
 VERSION_NAME=0.4.0-SNAPSHOT
 
@@ -8,17 +17,13 @@ POM_SCM_URL=https://github.com/JakeWharton/diffuse/
 POM_SCM_CONNECTION=scm:git:git://github.com/JakeWharton/diffuse.git
 POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/JakeWharton/diffuse.git
 
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_NAME=Apache-2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=jakewharton
 POM_DEVELOPER_NAME=Jake Wharton
 
-org.gradle.caching=true
-org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
-org.gradle.parallel=true
-
 mavenCentralPublishing=true
 mavenCentralAutomaticPublishing=true
 signAllPublications=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2fe780f9..5cd5dcb6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,16 +1,12 @@
 [versions]
-# Keep this values in sync with bundletool"s dependencies.
-aapt2Proto = "9.1.0-14792394"
-protobufJava = "4.34.1"
-guava = "30.1-jre"
 
 [libraries]
 dalvikDx = "com.jakewharton.android.repackaged:dalvik-dx:16.0.1"
 binaryResources = "com.android.tools.apkparser:binary-resources:32.1.0"
 apkSigner = "com.android.tools.build:apksig:9.1.0"
 bundleTool = "com.android.tools.build:bundletool:1.18.3"
-aapt2Proto = { module = "com.android.tools.build:aapt2-proto", version.ref = "aapt2Proto" }
-protobufJava = { module = "com.google.protobuf:protobuf-java", version.ref = "protobufJava" }
+aapt2Proto = "com.android.tools.build:aapt2-proto:9.1.0-14792394"
+protobufJava = "com.google.protobuf:protobuf-java:4.34.1"
 clikt = "com.github.ajalt.clikt:clikt:5.1.0"
 junit = "junit:junit:4.13.2"
 assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
diff --git a/settings.gradle b/settings.gradle
index b69be549..6ac87e62 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,7 @@
 pluginManagement {
-  dependencyResolutionManagement {
-    repositories {
-      mavenCentral()
-      gradlePluginPortal()
-    }
+  repositories {
+    mavenCentral()
+    gradlePluginPortal()
   }
 }
 dependencyResolutionManagement {
@@ -13,6 +11,7 @@ dependencyResolutionManagement {
   }
 }
 
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = 'diffuse-root'