build: update gradle and ci workflows

Signed-off-by: goncalo-frade-iohk <goncalo.frade@iohk.io>

Author: goncalo-frade-iohk

.github/workflows/build-and-test.yml

@@ -60,6 +60,9 @@ jobs:
       - name: Runner
         run: echo ${{ runner.os }}
 
+      - name: "Test Kotlin code is properly formatted"
+        run: ./gradlew ktlintCheck
+
       - name: Build for JS, Android, JVM
         run: ./gradlew build allTests koverXmlReportRelease koverHtmlReportRelease --stacktrace
 

.github/workflows/release.yml

@@ -3,19 +3,13 @@ name: Release SDK
 
 env:
   JAVA_VERSION: 17
-  SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-  GITHUB_ACTOR: "hyperledger-bot"
-  GITHUB_ACTOR_EMAIL: "hyperledger-bot@hyperledger.org"
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-  OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-  OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-  OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-
 
 on:
   workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to release (e.g., 1.2.3)'
+        required: true
 
 permissions:
   contents: write
@@ -44,9 +38,25 @@ jobs:
           server-username: ${{ secrets.OSSRH_USERNAME }}
           server-password: ${{ secrets.OSSRH_PASSWORD }}
 
+      - name: Update gradle.properties with new version
+        run: |
+          sed -i '' 's/^version = *.*.*/version = ${{ github.event.inputs.version }}/' gradle.properties
+
+      - name: Build Kotlin Multiplatform Maven Artifacts
+        run: ./gradlew publishToMavenLocal --no-configuration-cache
+
+      - name: Publish JVM & Android to Maven Central
+        if: ${{ inputs.release_maven }}
+        env:
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.HYP_BOT_GPG_PRIVATE }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.HYP_BOT_GPG_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_autoRelease: true
+        run: ./gradlew publishToMavenCentral --no-configuration-cache
 
-      - uses: crazy-max/ghaction-import-gpg@v5
-        id: import_gpg
+      - uses: crazy-max/ghaction-import-gpg@v6
+        id: import-gpg
         with:
           gpg_private_key: ${{ secrets.HYP_BOT_GPG_PRIVATE }}
           passphrase: ${{ secrets.HYP_BOT_GPG_PASSWORD }}
@@ -55,18 +65,21 @@ jobs:
           git_config_global: true
           git_tag_gpgsign: false
 
-      - name: "Release"
+      - name: Commit updated files and tag the release
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_author: "${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>"
+          commit_user_name: ${{ steps.import-gpg.outputs.name }}
+          commit_user_email: ${{ steps.import-gpg.outputs.email }}
+          commit_options: '-s -S'
+          commit_message: |
+            chore(release): v${{ github.event.inputs.version }}
+          tagging_message: v${{ github.event.inputs.version }}
+          file_pattern: gradle.properties
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ github.event.inputs.version }}
         env:
-          GITHUB_TOKEN: ${{ secrets.IDENTUS_CI }}
-          GITHUB_ACTOR: ${{ steps.import_gpg.outputs.name }}
-          GIT_AUTHOR_EMAIL: ${{ steps.import_gpg.outputs.email }}
-          GIT_COMMITTER_EMAIL: ${{ steps.import_gpg.outputs.email }}
-          GIT_AUTHOR_NAME: ${{ steps.import_gpg.outputs.name }}
-          GIT_COMMITTER_NAME: ${{ steps.import_gpg.outputs.name }}
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          OSSRH_GPG_SECRET_KEY: ${{ secrets.HYP_BOT_GPG_PRIVATE }}
-          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.HYP_BOT_GPG_PASSWORD }}
-        run: |
-          npm install
-          npx semantic-release
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -4,13 +4,15 @@ val groupId = "org.hyperledger.identus"
 val os: OperatingSystem = OperatingSystem.current()
 
 plugins {
-    id("com.android.library") version "8.1.4" apply false
-    kotlin("jvm") version "1.9.24"
-    kotlin("plugin.serialization") version "1.8.20"
-    id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
-    id("org.jetbrains.dokka") version "1.9.20"
-    id("org.jetbrains.kotlin.kapt") version "1.9.10"
-    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
+    alias(libs.plugins.kotlinJvm)
+    alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.androidApplication) apply false
+    alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.mavenPublish) apply false
+    alias(libs.plugins.dokka) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.ktlint)
 }
 
 buildscript {
@@ -20,12 +22,6 @@ buildscript {
         google()
         gradlePluginPortal()
     }
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
-        classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.1")
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
-        classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.23.1")
-    }
 }
 
 java {
@@ -37,24 +33,6 @@ java {
 allprojects {
     this.group = groupId
 
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-        maven("https://plugins.gradle.org/m2/")
-        // Needed for Kotlin coroutines that support new memory management mode
-        maven {
-            url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven")
-        }
-        maven {
-            setUrl("https://maven.pkg.github.com/hyperledger/aries-uniffi-wrappers")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-
     configurations.all {
         resolutionStrategy {
             eachDependency {
@@ -100,14 +78,3 @@ subprojects {
         }
     }
 }
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/"))
-            username.set(System.getenv("OSSRH_USERNAME"))
-            password.set(System.getenv("OSSRH_PASSWORD"))
-        }
-    }
-}

gradle.properties

@@ -1,11 +1,9 @@
-version = 3.0.0
+version = 4.0.0
 org.gradle.jvmargs = -Xmx3072M -Dkotlin.daemon.jvm.options="-Xmx3072M"
 kotlin.code.style = official
 android.useAndroidX = true
 kotlin.mpp.enableCInteropCommonization = true
 kotlin.native.cacheKind.iosSimulatorArm64 = none
-apollo_version = 1.4.2
-didpeer_version = 1.1.2
 kotlin.mpp.androidSourceSetLayoutVersion = 2
 kotlinx.atomicfu.enableJvmIrTransformation = true
 kotlinx.atomicfu.enableJsIrTransformation = true

gradle/libs.versions.toml

@@ -0,0 +1,124 @@
+[versions]
+kotlin = "1.9.20"
+agp = "8.2.2"
+apollo = "1.4.2"
+didpeer = "1.1.2"
+kotlincrypto-hash-sha = "0.4.0"
+didcomm = "0.3.2"
+anoncreds = "0.2.0-wrapper.1"
+bignum = "0.3.9"
+bouncycastle = "1.68"
+sdjwt = "0.4.0"
+jsonld = "1.4.0"
+json = "2.0.1"
+protoc = "3.12.0"
+urdna = "1.3"
+
+ksp = "1.9.20-1.0.14" # pick a KSP in the 1.9.x line; adjust if needed
+ktlint = "12.1.0"
+dokka = "1.9.20"
+sqldelight = "2.0.1"
+protobuf-plugin = "0.9.1"
+vanniktech-maven-publish = "0.28.0"
+
+coroutines = "1.8.1"
+serialization = "1.6.0"
+ktor = "2.3.11"
+datetime = "0.6.0"
+kotlin-kover = "0.7.6"
+
+androidx-core-ktx = "1.7.0"
+androidx-appcompat = "1.6.0"
+androidx-constraintlayout = "2.1.4"
+androidx-navigation = "2.5.3"
+material = "1.8.0"
+lifecycle = "2.3.1"
+room = "2.4.2"
+
+junit4 = "4.13.2"
+androidx-junit = "1.1.5"
+espresso = "3.5.1"
+lighthouse-logging = "1.1.2"
+mockito = "4.4.0"
+mockito-kotlin = "4.0.0"
+
+[libraries]
+# Dependencies
+dependencies-apollo = { module = "org.hyperledger.identus.apollo:apollo", version.ref = "apollo" }
+dependencies-didpeer = { module = "io.iohk.atala.prism.didcomm:didpeer", version.ref = "didpeer" }
+dependencies-kotlincrypto-hash-sha = { module = "org.kotlincrypto.hash:sha2", version.ref = "kotlincrypto-hash-sha" }
+dependencies-didcomm = { module = "org.didcommx:didcomm", version.ref = "didcomm" }
+dependencies-anoncreds = { module = "org.hyperledger:anoncreds_uniffi", version.ref = "anoncreds" }
+dependencies-ionspin-bignum = { module = "com.ionspin.kotlin:bignum", version.ref = "bignum" }
+dependencies-bouncycastle = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" }
+dependencies-eudi-sdjwt = { module = "eu.europa.ec.eudi:eudi-lib-jvm-sdjwt-kt", version.ref = "sdjwt" }
+dependencies-json-ld = { module = "com.apicatalog:titanium-json-ld-jre8", version.ref = "jsonld" }
+dependencies-json = { module = "org.glassfish:jakarta.json", version.ref = "json" }
+dependencies-protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc"}
+dependencies-setl-rdf-urdna = { module = "io.setl:rdf-urdna", version.ref = "urdna"}
+
+# AndroidX
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
+androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
+androidx-navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
+androidx-material = { module = "com.google.android.material:material", version.ref = "material" }
+androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+
+room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
+room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
+
+# KotlinX
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime"}
+
+# Ktor
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
+ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
+ktor-websockets = { module = "io.ktor:ktor-websockets", version.ref = "ktor" }
+
+# SqlDelight
+sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
+sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
+sqldelight-couroutines-extensions = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
+
+# Testing
+junit4 = { module = "junit:junit", version.ref = "junit4" }
+androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
+androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+
+lighthouse-logging = { module = "org.lighthousegames:logging", version.ref = "lighthouse-logging" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
+ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
+
+protobuf-java = { module = "com.google.protobuf:protobuf-java", version = "3.14.0" }
+pbandk-runtime = { module = "pro.streem.pbandk:pbandk-runtime", version = "0.14.2" }
+
+[plugins]
+androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary     = { id = "com.android.library",     version.ref = "agp" }
+
+kotlinJvm           = { id = "org.jetbrains.kotlin.jvm",                  version.ref = "kotlin" }
+kotlinAndroid       = { id = "org.jetbrains.kotlin.android",              version.ref = "kotlin" }
+kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+
+ksp        = { id = "com.google.devtools.ksp",       version.ref = "ksp" }
+ktlint     = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
+dokka      = { id = "org.jetbrains.dokka",           version.ref = "dokka" }
+sqldelight = { id = "app.cash.sqldelight",           version.ref = "sqldelight" }
+protobuf   = { id = "com.google.protobuf",           version.ref = "protobuf-plugin" }
+kotlinKover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlin-kover" }
+
+mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-publish" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

protosLib/build.gradle.kts

@@ -7,7 +7,8 @@ val os: OperatingSystem = OperatingSystem.current()
 
 plugins {
     `java-library`
-    id("com.google.protobuf")
+    alias(libs.plugins.kotlinJvm)
+    alias(libs.plugins.protobuf)
 }
 
 // Mock configuration which derives compile only.
@@ -18,7 +19,8 @@ val jarPathConf: Configuration by configurations.creating {
 
 dependencies {
     // This is needed for includes, ref: https://github.com/google/protobuf-gradle-plugin/issues/41#issuecomment-143884188
-    compileOnly("com.google.protobuf:protobuf-java:3.14.0")
+    implementation(libs.pbandk.runtime)
+    implementation(libs.pbandk.runtime)
 }
 
 sourceSets {