Minor configuration cleanups

.github/workflows/build.yaml

@@ -4,7 +4,7 @@ on:
   pull_request: {}
   push:
     branches:
-      - '*'
+      - 'trunk'
     tags:
       - '*'
 
@@ -19,7 +19,7 @@ jobs:
           distribution: 'zulu'
           java-version-file: .github/workflows/.java-version
 
-      - uses: gradle/actions/wrapper-validation@v4
+      - uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew build
       - run: build/dependency-tree-diff.jar --help
 

build.gradle

@@ -1,7 +1,10 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 buildscript {
+	repositories {
+		mavenCentral()
+	}
 	dependencies {
 		classpath libs.kotlin.gradle.plugin
 	}
@@ -20,35 +23,37 @@ dependencies {
 	r8 libs.r8
 }
 
+def targetJavaVersion = 11
+
 tasks.withType(JavaCompile).configureEach {
-	sourceCompatibility = JavaVersion.VERSION_11
-	targetCompatibility = JavaVersion.VERSION_11
+	options.release = targetJavaVersion
 }
 
 tasks.withType(KotlinJvmCompile).configureEach {
 	compilerOptions {
-		jvmTarget = JvmTarget.JVM_11
+		jvmTarget = JvmTarget.fromTarget(targetJavaVersion.toString())
 		freeCompilerArgs.addAll(
 			'-Xno-call-assertions',
 			'-Xno-param-assertions',
 			'-Xno-receiver-assertions',
+			"-Xjdk-release=$targetJavaVersion",
 		)
 	}
 }
 
-def fatJarProvider = tasks.register('fatJar', Jar) { task ->
-	task.dependsOn(configurations.named('runtimeClasspath'))
-	task.dependsOn(tasks.named('jar'))
+tasks.named('jar', Jar) {
+	// We don't need the thin jar, use the fatJar instead.
+	enabled = false
+}
 
+def fatJarProvider = tasks.register('fatJar', Jar) { task ->
 	task.archiveClassifier = 'fat'
 
 	task.manifest {
 		attributes 'Main-Class': 'com.jakewharton.gradle.dependencies.DependencyTreeDiff'
 	}
 
-	def sourceClasses = sourceSets.main.output.classesDirs
-	task.inputs.files(sourceClasses)
-	task.from files(sourceClasses)
+	task.from sourceSets.named('main').map { it.output }
 	task.from configurations.named('runtimeClasspath').map {
 		it.asFileTree.files.collect { it.isDirectory() ? it : zipTree(it) }
 	}
@@ -111,13 +116,3 @@ tasks.named('assemble').configure { task ->
 artifacts {
 	archives file: binaryFile, name: 'binary', type: 'jar', builtBy: binaryJar, classifier: 'binary'
 }
-
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-}
-repositories {
-	mavenCentral()
-	google()
-}

settings.gradle

@@ -2,4 +2,17 @@ plugins {
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
+dependencyResolutionManagement {
+	repositories {
+		mavenCentral()
+		google {
+			mavenContent {
+				includeGroupAndSubgroups("androidx")
+				includeGroupAndSubgroups("com.android")
+				includeGroupAndSubgroups("com.google")
+			}
+		}
+	}
+}
+
 rootProject.name = 'dependency-tree-diff'