Merge pull request #131 from RADAR-base/release-1.1.0

Release 1.1.0

.github/workflows/main.yml

@@ -21,10 +21,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.8.0
 
       # Compile the code
       - name: Compile code

.github/workflows/publish_snapshots.yml

@@ -20,11 +20,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
+        uses: gradle/[email protected]
       - name: Has SNAPSHOT version
         run: ./gradlew properties | grep '^version:.*-SNAPSHOT$'
 
@@ -44,5 +43,6 @@ jobs:
 
       - name: Publish gradle plugin
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew :radar-commons-gradle:publish
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        run: ./gradlew -Psigning.gnupg.keyName=CBEF2CF0 -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} :radar-commons-gradle:publish

.github/workflows/release.yml

@@ -18,11 +18,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
+        uses: gradle/[email protected]
       - name: Check version
         run: |
           projectVersion=$(./gradlew properties | grep '^version:.*$')
@@ -34,13 +33,13 @@ jobs:
 
       # Compile code
       - name: Compile code
-        run: ./gradlew assemble
+        run: ./gradlew assemble collectLicenses
 
       # Upload it to GitHub
       - name: Upload to GitHub
-        uses: AButler/[email protected]
+        uses: AButler/[email protected].2
         with:
-          files: 'radar-commons*/build/libs/*'
+          files: 'radar-commons*/build/libs/*;radar-commons*/build/reports/*.tar.gz'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install gpg secret key
@@ -56,5 +55,6 @@ jobs:
 
       - name: Publish gradle plugin
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew :radar-commons-gradle:publish
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        run: ./gradlew -Psigning.gnupg.keyName=CBEF2CF0 -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} :radar-commons-gradle:publish

.github/workflows/scheduled_snyk.yaml

@@ -21,11 +21,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
+        uses: gradle/[email protected]
       - name: Run Snyk
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/snyk.yaml

@@ -16,11 +16,10 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
+        uses: gradle/[email protected]
       - name: Run Snyk to check for vulnerabilities
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.snyk

@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.25.0
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JAVA-ORGJETBRAINSKOTLIN-2393744:
+    - '*':
+        reason: Not using Kotlin Files API
+        expires: 2025-10-06T13:21:34.435Z
+        created: 2023-09-06T13:21:34.439Z
+patch: {}

README.md

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.radarbase:radar-commons:1.0.0")
+    implementation("org.radarbase:radar-commons:1.1.0")
 }
 ```
 
@@ -62,7 +62,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.radarbase:radar-commons-server:1.0.0")
+    implementation("org.radarbase:radar-commons-server:1.1.0")
 }
 ```
 
@@ -75,7 +75,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.radarbase:radar-commons-testing:1.0.0")
+    testImplementation("org.radarbase:radar-commons-testing:1.1.0")
 }
 ```
 
@@ -102,7 +102,7 @@ configurations.all {
 }
 
 dependencies {
-    implementation("org.radarbase:radar-commons:1.0.1-SNAPSHOT")
+    implementation("org.radarbase:radar-commons:1.1.1-SNAPSHOT")
 }
 ```
 

build.gradle.kts

@@ -30,6 +30,7 @@ val githubUrl = "https://github.com/$githubRepoName"
 
 radarRootProject {
     projectVersion.set(Versions.project)
+    gradleVersion.set(Versions.Plugins.gradle)
 }
 
 subprojects {
@@ -66,8 +67,4 @@ subprojects {
         junitVersion.set(Versions.junit)
         slf4jVersion.set(Versions.slf4j)
     }
-
-    //---------------------------------------------------------------------------//
-    // Style checking                                                            //
-    //---------------------------------------------------------------------------//
 }

buildSrc/build.gradle.kts

@@ -1,7 +1,24 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
 }
 
 repositories {
     mavenCentral()
 }
+
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
+}
+
+tasks.withType<KotlinCompile> {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+    }
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -1,25 +1,26 @@
 object Versions {
-    const val project = "1.0.0"
+    const val project = "1.1.0"
 
     object Plugins {
-        const val kotlin = "1.8.21"
+        const val kotlin = "1.9.10"
         const val kotlinSerialization = kotlin
-        const val avro = "1.7.0"
+        const val avro = "1.8.0"
+        const val gradle = "8.3"
     }
 
     const val java = 11
-    const val slf4j = "2.0.7"
-    const val confluent = "7.3.2"
-    const val kafka = "7.3.2-ce"
-    const val avro = "1.11.1"
-    const val jackson = "2.15.0"
+    const val slf4j = "2.0.9"
+    const val confluent = "7.5.0"
+    const val kafka = "7.5.0-ce"
+    const val avro = "1.11.2"
+    const val jackson = "2.15.2"
     const val okhttp = "4.11.0"
-    const val junit = "5.9.3"
-    const val mockito = "5.3.1"
-    const val mockitoKotlin = "4.1.0"
+    const val junit = "5.10.0"
+    const val mockito = "5.5.0"
+    const val mockitoKotlin = "5.1.0"
     const val hamcrest = "2.2"
-    const val radarSchemas = "0.8.2"
-    const val opencsv = "5.7.1"
-    const val ktor = "2.3.0"
-    const val coroutines = "1.6.4"
+    const val radarSchemas = "0.8.4"
+    const val opencsv = "5.8"
+    const val ktor = "2.3.4"
+    const val coroutines = "1.7.3"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

radar-commons-gradle/README.md

@@ -11,29 +11,10 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        maven(url = "https://maven.pkg.github.com/radar-base/radar-commons") {
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                    ?: extra.properties["gpr.user"] as? String
-                    ?: extra.properties["public.gpr.user"] as? String
-                password = System.getenv("GITHUB_TOKEN")
-                    ?: extra.properties["gpr.token"] as? String
-                    ?: (extra.properties["public.gpr.token"] as? String)?.let {
-                        Base64.getDecoder().decode(it).decodeToString()
-                    }
-            }
-        }
     }
 }
 ```
 
-We recommend to store a Base64 encoded PAT in your projects' `gradle.properties` with only `read:packages` access, created in your [GitHub Developer settings](https://github.com/settings/tokens/new?scopes=read:packages&description=GPR%20for%20Gradle). The Base64 encoded token should be stored as `public.gpr.token` and the associated username as `public.gpr.user`. To use your personal PAT, store the PAT in `~/.gradle/gradle.properties` with keys `gpr.user` and `gpr.token`. Use the following PAT if needed
-```properties
-public.gpr.user=radar-public
-public.gpr.token=Z2hwX0h0d0FHSmJzeEpjenBlUVIycVhWb0RpNGdZdHZnZzJTMFVJZA==
-```
-Note that the above credentials may be changed or revoked at any time.
-
 Then use the plugins with the following root project configurations:
 
 ```gradle