Rename packages in AWS module

consolidate build scripts with convention plugin
report jacoco on PR

.github/workflows/build.yml

@@ -1,5 +1,11 @@
 name: Run Gradle on PRs
-on: pull_request
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
 jobs:
   gradle:
     runs-on: ubuntu-latest
@@ -10,11 +16,42 @@ jobs:
           java-version: 17
           cache: 'gradle'
           distribution: "temurin"
-      - run: ./gradlew build --no-daemon
+      - run: ./gradlew build testCodeCoverageReport --no-daemon
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4
         if: success() || failure() # always run even if the previous step fails
         with:
           report_paths: '**/build/test-results/*/TEST-*.xml'
           detailed_summary: true
-          include_passed: true
+          include_passed: true
+      # generates coverage-report.md and publishes as checkrun
+      - name: JaCoCo Code Coverage Report
+        id: jacoco_reporter
+        uses: PavanMudigonda/[email protected]
+        with:
+          coverage_results_path: build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          coverage_report_name: Coverage
+          coverage_report_title: JaCoCo
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          skip_check_run: false
+          minimum_coverage: 80
+          fail_below_threshold: false
+          publish_only_summary: false
+
+      # Publish Coverage Job Summary  # Optional
+      - name: Add Jacocoo report to workflow run summary
+        run: |
+          echo "| Outcome | Value |" >> $GITHUB_STEP_SUMMARY
+          echo "| --- | --- |" >> $GITHUB_STEP_SUMMARY
+          echo "| Code Coverage % | ${{ steps.jacoco_reporter.outputs.coverage_percentage }} |" >> $GITHUB_STEP_SUMMARY
+          echo "| :heavy_check_mark: Number of Lines Covered | ${{ steps.jacoco_reporter.outputs.covered_lines }} |" >> $GITHUB_STEP_SUMMARY
+          echo "| :x: Number of Lines Missed | ${{ steps.jacoco_reporter.outputs.missed_lines }} |" >> $GITHUB_STEP_SUMMARY
+          echo "| Total Number of Lines | ${{ steps.jacoco_reporter.outputs.total_lines }} |" >> $GITHUB_STEP_SUMMARY
+
+      # uploads the coverage-report.md artifact  # Optional
+      - name: Upload Code Coverage Artifacts
+          uses: actions/upload-artifact@v4
+          with:
+            name: code-coverage-report-markdown
+            path: */coverage-results.md
+            retention-days: 1

.gitignore

@@ -1,4 +1,5 @@
 .gradle
 .idea
 build/
-.obsidian/
+.obsidian/
+.kotlin/

build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     kotlin("jvm") version ("2.0.0") apply (false)
+    id("jacoco-report-aggregation")
 }
 
 tasks.wrapper {
@@ -9,4 +10,25 @@ tasks.wrapper {
 
 subprojects {
     group = "com.github.wakingrufus.springdsl"
-}
+}
+
+dependencies {
+    subprojects.forEach {
+        jacocoAggregation(project(":"+it.name))
+    }
+}
+repositories {
+    mavenCentral()
+}
+
+reporting {
+    reports {
+        val testCodeCoverageReport by creating(JacocoCoverageReport::class) {
+            testType = TestSuiteType.UNIT_TEST
+        }
+    }
+}
+
+//tasks.named("build") {
+//    dependsOn(tasks.named<JacocoReport>("testCodeCoverageReport"))
+//}

buildSrc/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    kotlin("jvm") version ("2.0.0")
+    `kotlin-dsl`
+}
+repositories {
+    gradlePluginPortal()
+}

buildSrc/settings.gradle.kts

@@ -0,0 +1,2 @@
+
+rootProject.name="funk-conventions"

buildSrc/src/main/kotlin/funk.library.gradle.kts

@@ -0,0 +1,29 @@
+plugins {
+    `java-library`
+    `jvm-test-suite`
+    jacoco
+    id("jacoco-report-aggregation")
+}
+repositories {
+    mavenCentral()
+}
+project.tasks.named("build") {
+    dependsOn("jacocoTestReport")
+}
+testing {
+    suites {
+        named<JvmTestSuite>("test") {
+            useJUnitJupiter()
+        }
+    }
+}
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+tasks.jacocoTestReport {
+    reports {
+        xml.required = true
+    }
+}

spring-funk-aws/build.gradle.kts

@@ -1,12 +1,6 @@
 plugins {
-    id("java-library")
     kotlin("jvm")
-    `jvm-test-suite`
-    jacoco
-}
-
-repositories {
-    mavenCentral()
+    funk.library
 }
 
 dependencies {
@@ -33,9 +27,6 @@ dependencies {
 
 testing {
     suites {
-        named<JvmTestSuite>("test") {
-            useJUnitJupiter()
-        }
         // create a separate test suite for testing when micrometer is not on classpath
         create<JvmTestSuite>("noMicrometer") {
             useJUnitJupiter()
@@ -54,9 +45,3 @@ testing {
 tasks.named("check") {
     dependsOn(testing.suites.named("noMicrometer"))
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/AwsDsl.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/AwsDsl.kt

@@ -1,6 +1,6 @@
-package com.github.wakingrufus.springdsl.aws
+package com.github.wakingrufus.funk.aws
 
-import com.github.wakingrufus.springdsl.aws.s3.S3Dsl
+import com.github.wakingrufus.funk.aws.s3.S3Dsl
 import com.github.wakingrufus.funk.core.SpringDsl
 import com.github.wakingrufus.funk.core.SpringDslContainer
 import com.github.wakingrufus.funk.core.SpringDslMarker

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/AwsMicrometerMetricPublisher.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/AwsMicrometerMetricPublisher.kt

@@ -1,4 +1,4 @@
-package com.github.wakingrufus.springdsl.aws
+package com.github.wakingrufus.funk.aws
 
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.micrometer.core.instrument.MeterRegistry

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/GlobalAwsConfigurationProperties.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/GlobalAwsConfigurationProperties.kt

@@ -1,6 +1,6 @@
-package com.github.wakingrufus.springdsl.aws
+package com.github.wakingrufus.funk.aws
 
-import com.github.wakingrufus.springdsl.aws.GlobalAwsConfigurationProperties.Companion.PREFIX
+import com.github.wakingrufus.funk.aws.GlobalAwsConfigurationProperties.Companion.PREFIX
 import org.springframework.boot.context.properties.ConfigurationProperties
 
 @ConfigurationProperties(PREFIX)

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/s3/S3ClientBuilder.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/s3/S3ClientBuilder.kt

@@ -1,4 +1,4 @@
-package com.github.wakingrufus.springdsl.aws.s3
+package com.github.wakingrufus.funk.aws.s3
 
 import io.netty.handler.ssl.SslProvider
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/s3/S3ClientConfigurationProperties.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/s3/S3ClientConfigurationProperties.kt

@@ -1,4 +1,4 @@
-package com.github.wakingrufus.springdsl.aws.s3
+package com.github.wakingrufus.funk.aws.s3
 
 import java.time.Duration
 

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/s3/S3ClientInitializer.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/s3/S3ClientInitializer.kt

@@ -1,8 +1,8 @@
-package com.github.wakingrufus.springdsl.aws.s3
+package com.github.wakingrufus.funk.aws.s3
 
-import com.github.wakingrufus.springdsl.aws.AwsDsl
-import com.github.wakingrufus.springdsl.aws.AwsMicrometerMetricPublisher
-import com.github.wakingrufus.springdsl.aws.GlobalAwsConfigurationProperties
+import com.github.wakingrufus.funk.aws.AwsDsl
+import com.github.wakingrufus.funk.aws.AwsMicrometerMetricPublisher
+import com.github.wakingrufus.funk.aws.GlobalAwsConfigurationProperties
 import com.github.wakingrufus.funk.base.getDsl
 import com.github.wakingrufus.funk.util.normalizeConfigKey
 import io.micrometer.core.instrument.MeterRegistry

spring-funk-aws/src/main/kotlin/com/github/wakingrufus/springdsl/aws/s3/S3Dsl.kt → spring-funk-aws/src/main/kotlin/com/github/wakingrufus/funk/aws/s3/S3Dsl.kt

@@ -1,4 +1,4 @@
-package com.github.wakingrufus.springdsl.aws.s3
+package com.github.wakingrufus.funk.aws.s3
 
 import com.github.wakingrufus.funk.core.SpringDslMarker
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration

spring-funk-aws/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.context.ApplicationContextInitializer=\
-com.github.wakingrufus.springdsl.aws.s3.S3ClientInitializer
+com.github.wakingrufus.funk.aws.s3.S3ClientInitializer

spring-funk-aws/src/noMicrometer/kotlin/S3ClientInitializerTest.kt

@@ -1,5 +1,5 @@
-import com.github.wakingrufus.springdsl.aws.aws
-import com.github.wakingrufus.springdsl.aws.s3.S3ClientInitializer
+import com.github.wakingrufus.funk.aws.aws
+import com.github.wakingrufus.funk.aws.s3.S3ClientInitializer
 import com.github.wakingrufus.springdsl.test.testDslApplication
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test

spring-funk-aws/src/test/kotlin/com/github/wakingrufus/springdsl/aws/s3/S3ClientInitializerTest.kt

@@ -1,6 +1,7 @@
 package com.github.wakingrufus.springdsl.aws.s3
 
-import com.github.wakingrufus.springdsl.aws.aws
+import com.github.wakingrufus.funk.aws.aws
+import com.github.wakingrufus.funk.aws.s3.S3ClientInitializer
 import com.github.wakingrufus.funk.beans.BeanDslInitializer
 import com.github.wakingrufus.funk.beans.beans
 import com.github.wakingrufus.springdsl.test.testDslApplication

spring-funk-base/build.gradle.kts

@@ -1,14 +1,7 @@
 plugins {
-    id("java-library")
     kotlin("jvm")
-    `jvm-test-suite`
-    jacoco
+    funk.library
 }
-
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     api(project(":spring-funk-core"))
     api(spring.context)
@@ -20,17 +13,3 @@ dependencies {
     testImplementation(libs.oshai)
     testImplementation(libs.assertj)
 }
-
-testing {
-    suites {
-        named<JvmTestSuite>("test") {
-            useJUnitJupiter()
-        }
-    }
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}

spring-funk-core/build.gradle.kts

@@ -1,28 +1,8 @@
 plugins {
-    id("java-library")
     kotlin("jvm")
-    `jvm-test-suite`
-    jacoco
-}
-
-repositories {
-    mavenCentral()
+    funk.library
 }
 
 dependencies {
     testImplementation(libs.assertj)
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
-testing {
-    suites {
-        val test by getting(JvmTestSuite::class) {
-            useJUnitJupiter()
-        }
-    }
-}

spring-funk-runtimeconfig/build.gradle.kts

@@ -1,12 +1,6 @@
 plugins {
-    id("java-library")
     kotlin("jvm")
-    `jvm-test-suite`
-    jacoco
-}
-
-repositories {
-    mavenCentral()
+    funk.library
 }
 
 dependencies {
@@ -23,17 +17,3 @@ dependencies {
     testImplementation(libs.oshai)
     testImplementation(libs.assertj)
 }
-
-testing {
-    suites {
-        named<JvmTestSuite>("test") {
-            useJUnitJupiter()
-        }
-    }
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}

spring-funk-test/build.gradle.kts

@@ -1,15 +1,8 @@
 plugins {
-    id("java-library")
     kotlin("jvm")
-    `jvm-test-suite`
-    jacoco
+    funk.library
 }
 
-repositories {
-    mavenCentral()
-}
-
-
 dependencies {
     implementation(project(":spring-funk-base"))
     implementation(project(":spring-funk-core"))
@@ -20,9 +13,3 @@ dependencies {
     compileOnly("jakarta.servlet:jakarta.servlet-api:6.0.0")
     api(spring.test)
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}