Refactor Gradle build and publishing configurations

Consolidated Kotlin and publishing conventions into reusable Gradle scripts in `buildSrc`. Removed redundant scripts and updated workflows to align with the new configuration structure. Simplified dependency declarations and standardized plugin usage across modules.

Author: sksamuel

.editorconfig

@@ -9,5 +9,5 @@ max_line_length = 120
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.gradle.kts]
-indent_size = 3
+[{*.yml,yaml}]
+indent_size = 2

.github/workflows/main.yml

@@ -22,8 +22,8 @@ jobs:
       - name: run tests
         run: ./gradlew test
 
-      - name: deploy snapshot
-        run: ./gradlew publish
+      - name: deploy to sonatype snapshots
+        run: ./gradlew publishToMavenCentral
 
       - name: bundle the build report
         if: failure()
@@ -38,5 +38,7 @@ jobs:
 
 env:
   GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
-  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-  OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
+  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

.github/workflows/release.yml

@@ -25,8 +25,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-           distribution: 'adopt'
-           java-version: '11'
+          distribution: 'adopt'
+          java-version: '11'
 
       - name: deploy to sonatype
         run: ./gradlew publish
@@ -39,7 +39,7 @@ jobs:
 env:
   GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
   RELEASE_VERSION: ${{ github.event.inputs.version }}
-  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-  OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-  ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
-  ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
+  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
+  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

aedile-core/build.gradle.kts

@@ -1,5 +1,10 @@
+plugins {
+   id("kotlin-conventions")
+   id("publishing-conventions")
+}
+
 dependencies {
    api(libs.caffeine)
+   api(rootProject.libs.coroutines.core)
+   api(rootProject.libs.coroutines.jdk8)
 }
-
-apply("../publish.gradle.kts")

aedile-micrometer/build.gradle.kts

@@ -1,6 +1,9 @@
+plugins {
+   id("kotlin-conventions")
+   id("publishing-conventions")
+}
+
 dependencies {
    api(projects.aedileCore)
    api(libs.micrometer.core)
 }
-
-apply("../publish.gradle.kts")

build.gradle.kts

@@ -7,3 +7,8 @@ repositories {
 plugins {
    `kotlin-dsl`
 }
+
+dependencies {
+   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
+   implementation("com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.34.0")
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,50 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
+plugins {
+   `java-library`
+   kotlin("jvm")
+}
+
+java {
+   toolchain {
+      languageVersion.set(JavaLanguageVersion.of(11))
+   }
+   sourceCompatibility = JavaVersion.VERSION_11
+   targetCompatibility = JavaVersion.VERSION_11
+}
+
+kotlin {
+   compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_11)
+      apiVersion.set(KotlinVersion.KOTLIN_1_9)
+      languageVersion.set(KotlinVersion.KOTLIN_1_9)
+   }
+}
+
+dependencies {
+   testImplementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.21")
+   testImplementation("io.kotest:kotest-runner-junit5:5.9.1")
+   testImplementation("io.kotest:kotest-assertions-core:5.9.1")
+   testImplementation("io.kotest:kotest-assertions-json:5.9.1")
+   testImplementation("io.kotest:kotest-framework-datatest:5.9.1")
+   testImplementation("io.kotest:kotest-property:5.9.1")
+}
+
+tasks.named<Test>("test") {
+   useJUnitPlatform()
+   filter {
+      isFailOnNoMatchingTests = false
+   }
+   testLogging {
+      showExceptions = true
+      showStandardStreams = true
+      events = setOf(
+         TestLogEvent.FAILED,
+         TestLogEvent.PASSED
+      )
+      exceptionFormat = TestExceptionFormat.FULL
+   }
+}

buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+   id("com.vanniktech.maven.publish")
+}
+
+group = "com.sksamuel.aedile"
+version = Ci.version
+
+mavenPublishing {
+   publishToMavenCentral(automaticRelease = true)
+   signAllPublications()
+   pom {
+      name.set("aedile")
+      description.set("Kotlin Wrapper for Caffeine")
+      url.set("http://www.github.com/sksamuel/aedile")
+
+      scm {
+         connection.set("scm:git:http://www.github.com/sksamuel/aedile/")
+         developerConnection.set("scm:git:http://github.com/sksamuel/")
+         url.set("http://www.github.com/sksamuel/aedile/")
+      }
+
+      licenses {
+         license {
+            name.set("The Apache 2.0 License")
+            url.set("https://opensource.org/licenses/Apache-2.0")
+         }
+      }
+
+      developers {
+         developer {
+            id.set("sksamuel")
+            name.set("Stephen Samuel")
+            email.set("sam@sksamuel.com")
+         }
+      }
+   }
+}