Merge remote-tracking branch 'origin/main' into multi-language

Author: alexandru

.github/workflows/build.yaml

@@ -1,4 +1,4 @@
-name: CI
+name: Build
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: ['11', '21']
+        java-version: ['17', '21']
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java-version }}
@@ -25,50 +25,32 @@ jobs:
           #   ./**/*.gradle.kts
           #   ./gradle/wrapper/gradle-wrapper.properties
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Test
-        run: ./gradlew check -i --no-daemon
+        run: ./gradlew check --no-daemon
       - name: Upload Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always() # This ensures that test results are uploaded even if the test step fails
         with:
-          name: test-results
+          name: test-results-${{ matrix.java-version }}
           path: |
             **/build/reports/
             **/build/test-results/
 
-  test-sbt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          cache: 'sbt'
-          java-version: 21
-          distribution: 'temurin'
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-      - name: Setup sbt
-        uses: sbt/setup-sbt@v1
-      - name: Build and test
-        run: sbt -v publishLocalGradleDependencies ++test
-        working-directory: ./tasks-scala
-
-#  publish-snapshot:
+#  test-sbt:
 #    runs-on: ubuntu-latest
-#    needs: test
-#    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
 #    steps:
-#      - uses: actions/checkout@v3
-#      - name: Set up JDK 11
-#        uses: actions/setup-java@v3
+#      - uses: actions/checkout@v4
+#      - name: Set up JDK 21
+#        uses: actions/setup-java@v4
 #        with:
-#          java-version: 11
+#          cache: 'sbt'
+#          java-version: 21
 #          distribution: 'temurin'
-#      - name: Publish Snapshot
-#        run: ./gradlew publish --no-daemon -i
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-#          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+#      - name: Setup Gradle
+#        uses: gradle/actions/setup-gradle@v3
+#      - name: Setup sbt
+#        uses: sbt/setup-sbt@v1
+#      - name: Build and test
+#        run: sbt -v publishLocalGradleDependencies ++test
+#        working-directory: ./tasks-scala

.github/workflows/publish-release.yaml

@@ -1,23 +1,23 @@
-name: CI
+name: Publish Release
 
 on: workflow_dispatch
 
 jobs:
   publish-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Publish Snapshot
-        run: ./gradlew -PbuildRelease=true build publish --no-daemon -i
+        run: ./gradlew -PbuildRelease=true build publish --no-daemon
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.KEY_ID }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.KEY_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}

build.gradle.kts

@@ -3,32 +3,13 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 val projectVersion = property("project.version").toString()
 
 plugins {
-    id("org.jetbrains.dokka")
     id("com.github.ben-manes.versions")
 }
 
 repositories {
     mavenCentral()
 }
 
-buildscript {
-    dependencies {
-        classpath("org.jetbrains.dokka:dokka-base:2.0.0")
-        // classpath("org.jetbrains.dokka:kotlin-as-java-plugin:2.0.0")
-    }
-}
-
-//dokka {
-//    dokkaPublications.html {
-//        outputDirectory.set(rootDir.resolve("build/dokka"))
-//        outputDirectory.set(file("build/dokka"))
-//    }
-//}
-
-tasks.dokkaHtmlMultiModule {
-    outputDirectory.set(file("build/dokka"))
-}
-
 tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
     fun isNonStable(version: String): Boolean {
         val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }

gradle.properties

@@ -1,7 +1,4 @@
 kotlin.code.style=official
 
 # TO BE modified whenever a new version is released
-project.version=0.0.2
-
-# https://kotlinlang.org/docs/dokka-migration.html#sync-your-project-with-gradle
-org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
+project.version=0.0.3

settings.gradle.kts

@@ -1,9 +1,6 @@
 rootProject.name = "tasks"
 
 include("tasks-jvm")
-include("tasks-kotlin")
-include("tasks-kotlin-coroutines")
-include("tasks-scala")
 
 pluginManagement {
     repositories {

tasks-jvm/build.gradle.kts

@@ -2,6 +2,13 @@ plugins {
     id("tasks.java-project")
 }
 
+mavenPublishing {
+    pom {
+        name.set("Funfix Tasks (JVM)")
+        description.set("Task datatype, meant for cross-language interoperability.")
+    }
+}
+
 dependencies {
     api(libs.jspecify)
     compileOnly(libs.jetbrains.annotations)