refactor project and build

Valensas · Jul 17, 2024 · 8d4f3f6 · 8d4f3f6
1 parent 95cae60
commit 8d4f3f6
Show file tree

Hide file tree

Showing 13 changed files with 158 additions and 105 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -18,19 +18,11 @@ jobs:
           java-version: "21"
           distribution: graalvm
           cache: 'gradle'
-      - name: Validate version
+      - name: Publish
         run: |
           VERSION=${GITHUB_REF#refs/tags/}
-          if grep -Eq "version\s+=\s+\"${VERSION}\"" ./build.gradle.kts
-          then
-            echo "Publishing version '${VERSION}'"
-            ./gradlew publish
-          else
-            echo "Detected tag version '${VERSION}' and version from build.gradle.kts does not match."
-            exit 1
-          fi
-      - name: Publish
-        run: ./gradlew publishToCentralPortal
+          echo "Publishing version '${VERSION}'"
+          ./gradlew "-Pversion=$VERSION" publishToCentralPortal
         env:
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SIGNING_SECRETKEY: ${{ secrets.SIGNING_SECRETKEY }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,114 +1,47 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-repositories {
-    mavenCentral()
-}
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    `java-gradle-plugin`
     id("com.github.ben-manes.versions") version "0.51.0"
-    id("org.springframework.boot") version "3.3.1" apply false
-    id("io.spring.dependency-management") version "1.1.6"
-    id("org.jmailen.kotlinter") version "4.4.0"
+    kotlin("jvm") version "2.0.0"
+    id("org.jmailen.kotlinter") version "4.4.1"
     id("maven-publish")
     id("java-library")
-    kotlin("jvm") version "1.9.21"
-    id("net.thebugmc.gradle.sonatype-central-portal-publisher") version "1.2.3"
 }
 
-group = "com.valensas"
-version = "3.0.0"
-java.sourceCompatibility = JavaVersion.VERSION_17
+subprojects {
+    apply(plugin = "maven-publish")
+    apply(plugin="java-library")
+    apply(plugin="org.jetbrains.kotlin.jvm")
+    apply(plugin="org.jmailen.kotlinter")
 
-dependencyManagement {
-    imports {
-        mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
-    }
-}
+    group = "com.valensas"
 
-gradlePlugin {
-    val observabilityArtifactsPlugin by plugins.creating {
-        id = "com.valensas.observability-artifacts"
-        implementationClass = "com.valensas.observability.plugin.ObservabilityArtifactsPlugin"
+    repositories {
+        mavenCentral()
     }
-}
-
-dependencies {
-    implementation("org.graalvm.polyglot:polyglot:24.0.1")
-    compileOnly("io.micrometer:micrometer-tracing-bridge-brave")
-    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
-    compileOnly("io.github.openfeign:feign-micrometer:13.3")
-    compileOnly("org.springframework.boot:spring-boot-starter")
-    compileOnly("org.springframework.boot:spring-boot-starter-webflux")
 
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
+    java.sourceCompatibility = JavaVersion.VERSION_17
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
+    }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
+    dependencies {
+        testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     }
-}
 
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
+    tasks.withType<Test> {
+        useJUnitPlatform()
+    }
 
-publishing {
-    publications {
-        create<MavenPublication>("plugin") {
-            groupId = "com.valensas.observability-artifacts"
-            artifactId = "com.valensas.observability-artifacts"
-            from(components["java"])
-        }
-        create<MavenPublication>("artifact") {
-            groupId = "com.valensas"
-            artifactId = "observability"
-            from(components["java"])
-        }
+    tasks.getByName<Jar>("jar") {
+        archiveClassifier = ""
     }
-}
 
-tasks.getByName<Jar>("jar") {
-    archiveClassifier = ""
 }
 
-
-signing {
-    val keyId = System.getenv("SIGNING_KEYID")
-    val secretKey = System.getenv("SIGNING_SECRETKEY")
-    val passphrase = System.getenv("SIGNING_PASSPHRASE")
-
-    useInMemoryPgpKeys(keyId, secretKey, passphrase)
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
 }
-
-centralPortal {
-    username = System.getenv("SONATYPE_USERNAME")
-    password = System.getenv("SONATYPE_PASSWORD")
-
-    pom {
-        name = "Observability"
-        description = "A simple library to manage observability needs for Spring Boot."
-        url = "https://valensas.com/"
-        scm {
-            url = "https://github.com/Valensas/observability"
-        }
-
-        licenses {
-            license {
-                name.set("MIT License")
-                url.set("https://mit-license.org")
-            }
-        }
-
-        developers {
-            developer {
-                id.set("0")
-                name.set("Valensas")
-                email.set("[email protected]")
-            }
-        }
-    }
-}
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -0,0 +1,70 @@
+plugins {
+    id("org.springframework.boot") version "3.3.1" apply false
+    id("io.spring.dependency-management") version "1.1.6"
+    id("net.thebugmc.gradle.sonatype-central-portal-publisher") version "1.2.3"
+}
+
+dependencyManagement {
+    imports {
+        mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
+    }
+}
+
+dependencies {
+    implementation("org.graalvm.polyglot:polyglot:24.0.2")
+    compileOnly("io.micrometer:micrometer-tracing-bridge-brave")
+    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
+    compileOnly("io.github.openfeign:feign-micrometer:13.3")
+    compileOnly("org.springframework.boot:spring-boot-starter")
+    compileOnly("org.springframework.boot:spring-boot-starter-webflux")
+}
+
+
+publishing {
+    publications {
+        create("library", MavenPublication::class.java) {
+            artifactId = "observability"
+            from(components["java"])
+        }
+    }
+    repositories {
+        mavenLocal()
+    }
+}
+
+signing {
+    val keyId = System.getenv("SIGNING_KEYID")
+    val secretKey = System.getenv("SIGNING_SECRETKEY")
+    val passphrase = System.getenv("SIGNING_PASSPHRASE")
+
+    useInMemoryPgpKeys(keyId, secretKey, passphrase)
+}
+
+centralPortal {
+    name = "observability"
+    username = System.getenv("SONATYPE_USERNAME")
+    password = System.getenv("SONATYPE_PASSWORD")
+    pom {
+        name = "Observability"
+        description = "A simple library to manage observability needs for Spring Boot."
+        url = "https://valensas.com/"
+        scm {
+            url = "https://github.com/Valensas/observability"
+        }
+
+        licenses {
+            license {
+                name.set("MIT License")
+                url.set("https://mit-license.org")
+            }
+        }
+
+        developers {
+            developer {
+                id.set("0")
+                name.set("Valensas")
+                email.set("[email protected]")
+            }
+        }
+    }
+}
diff --git a/...ntegrationRequestObservationConvention.kt → ...ntegrationRequestObservationConvention.kt b/...ntegrationRequestObservationConvention.kt → ...ntegrationRequestObservationConvention.kt
diff --git a/...onfig/FeignMicrometerAutoConfiguration.kt → ...onfig/FeignMicrometerAutoConfiguration.kt b/...onfig/FeignMicrometerAutoConfiguration.kt → ...onfig/FeignMicrometerAutoConfiguration.kt
diff --git a/...bility/config/TracingAutoConfiguration.kt → ...bility/config/TracingAutoConfiguration.kt b/...bility/config/TracingAutoConfiguration.kt → ...bility/config/TracingAutoConfiguration.kt
diff --git a/...config/VersionMetricsAutoConfiguration.kt → ...config/VersionMetricsAutoConfiguration.kt b/...config/VersionMetricsAutoConfiguration.kt → ...config/VersionMetricsAutoConfiguration.kt
diff --git a/...tional-spring-configuration-metadata.json → ...tional-spring-configuration-metadata.json b/...tional-spring-configuration-metadata.json → ...tional-spring-configuration-metadata.json
diff --git a/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports b/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    `java-gradle-plugin`
+    id("net.thebugmc.gradle.sonatype-central-portal-publisher") version "1.2.3"
+}
+
+group = "com.valensas.observability-artifacts"
+
+gradlePlugin {
+    plugins {
+        create("artifacts") {
+            id = "com.valensas.observability-artifacts"
+            implementationClass = "com.valensas.observability.plugin.ObservabilityArtifactsPlugin"
+        }
+    }
+}
+
+signing {
+    val keyId = System.getenv("SIGNING_KEYID")
+    val secretKey = System.getenv("SIGNING_SECRETKEY")
+    val passphrase = System.getenv("SIGNING_PASSPHRASE")
+
+    useInMemoryPgpKeys(keyId, secretKey, passphrase)
+}
+
+centralPortal {
+    name = "observability-artifacts.gradle.plugin"
+    username = System.getenv("SONATYPE_USERNAME")
+    password = System.getenv("SONATYPE_PASSWORD")
+    pom {
+        name = "Observability Plugins"
+        description = "A simple library to manage observability needs for Spring Boot."
+        url = "https://valensas.com/"
+        scm {
+            url = "https://github.com/Valensas/observability"
+        }
+
+        licenses {
+            license {
+                name.set("MIT License")
+                url.set("https://mit-license.org")
+            }
+        }
+
+        developers {
+            developer {
+                id.set("0")
+                name.set("Valensas")
+                email.set("[email protected]")
+            }
+        }
+    }
+}
diff --git a/...ty/plugin/ObservabilityArtifactsPlugin.kt → ...ty/plugin/ObservabilityArtifactsPlugin.kt b/...ty/plugin/ObservabilityArtifactsPlugin.kt → ...ty/plugin/ObservabilityArtifactsPlugin.kt
diff --git a/...lugin/ObservabilityArtifactsPluginTest.kt → ...lugin/ObservabilityArtifactsPluginTest.kt b/...lugin/ObservabilityArtifactsPluginTest.kt → ...lugin/ObservabilityArtifactsPluginTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+}
 rootProject.name = "observability"
+
+include("library")
+include("plugins")