From dc8fd387a6be07eb508657488b943f853df62f9f Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Fri, 2 Aug 2024 20:45:35 +0700 Subject: [PATCH 01/16] feat: add a beta branch and rust-init installer to the release flow Signed-off-by: Yurii Shynbuiev --- .github/workflows/release.yml | 5 +++-- .releaserc.yml | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 440ceda38..43723a4b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,9 +56,10 @@ jobs: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - - name: "Install autoconf, automake, libtool" + - name: "Install autoconf, automake, libtool, rustup" run: | - brew install autoconf automake libtool + brew install autoconf automake libtool rustup-init + rustup-init -y - name: "Install Mac ToolChain" run: | diff --git a/.releaserc.yml b/.releaserc.yml index 450667959..5ab14073b 100644 --- a/.releaserc.yml +++ b/.releaserc.yml @@ -2,6 +2,8 @@ branches: - name: "main" - name: "release/*" prerelease: "snapshot" + - name: "beta" + prerelease: true plugins: - "@semantic-release/commit-analyzer" From 65972ac111b649a98c336f4799b1d30d1bb7e76e Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Fri, 2 Aug 2024 14:21:50 +0000 Subject: [PATCH 02/16] chore(release): cut apollo version 1.4.0-beta.1 # [1.4.0-beta.1](https://github.com/hyperledger/identus-apollo/compare/v1.3.24...v1.4.0-beta.1) (2024-08-02) ### Features * add a beta branch and rust-init installer to the release flow ([dc8fd38](https://github.com/hyperledger/identus-apollo/commit/dc8fd387a6be07eb508657488b943f853df62f9f)) Signed-off-by: Hyperledger Bot --- CHANGELOG.md | 7 +++++++ Package.swift | 4 ++-- gradle.properties | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 906e84940..1f46ee681 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.4.0-beta.1](https://github.com/hyperledger/identus-apollo/compare/v1.3.24...v1.4.0-beta.1) (2024-08-02) + + +### Features + +* add a beta branch and rust-init installer to the release flow ([dc8fd38](https://github.com/hyperledger/identus-apollo/commit/dc8fd387a6be07eb508657488b943f853df62f9f)) + ## [1.3.24](https://github.com/hyperledger/identus-apollo/compare/v1.3.23...v1.3.24) (2024-07-19) diff --git a/Package.swift b/Package.swift index 436309a56..7aad77f3c 100644 --- a/Package.swift +++ b/Package.swift @@ -24,8 +24,8 @@ let package = Package( // RELEASE .binaryTarget( name: "ApolloBinary", - url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.3.24/Apollo.xcframework.zip", - checksum: "05c4557410b7b4bcee5ad18943b729f3f1ffa9320dfe2f8159179eb99a0354fc" + url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.1/Apollo.xcframework.zip", + checksum: "35b9d7dd40f140040e9f15d5401ae3be75e21cac18fb6bc0acd846b15d706ead" ) ] ) diff --git a/gradle.properties b/gradle.properties index 6f4778ccf..b506b0e8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 1.3.24 +version = 1.4.0-beta.1 org.gradle.jvmargs = -Xmx3072M -Dkotlin.daemon.jvm.options="-Xmx3072M" kotlin.code.style = official android.useAndroidX = true From 4ad87a6851b15edc0bc342def309e51e894025ca Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Fri, 2 Aug 2024 21:38:54 +0700 Subject: [PATCH 03/16] chore: add --debug to the semantic-release Signed-off-by: Yurii Shynbuiev --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43723a4b2..53a61c5cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,8 +58,7 @@ jobs: - name: "Install autoconf, automake, libtool, rustup" run: | - brew install autoconf automake libtool rustup-init - rustup-init -y + brew install autoconf automake libtool rustup - name: "Install Mac ToolChain" run: | @@ -137,4 +136,4 @@ jobs: OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} run: | npm install - npx semantic-release + npx semantic-release --debug From b85edb717a12fabdbc8becded70b20b1cfd0e077 Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Tue, 6 Aug 2024 01:22:45 +0700 Subject: [PATCH 04/16] feat: add --info to the CI Signed-off-by: Yurii Shynbuiev --- .github/workflows/release.yml | 2 +- README.md | 4 ++-- build.gradle.kts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53a61c5cd..6f48c92b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -136,4 +136,4 @@ jobs: OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} run: | npm install - npx semantic-release --debug + npx semantic-release --info diff --git a/README.md b/README.md index 858b802f0..8642b721a 100644 --- a/README.md +++ b/README.md @@ -108,9 +108,9 @@ You should be able to import and build the project in IntelliJ IDEA now. Here is a list of common issues you might face and its solutions. -##### Enviroment Variables were added but not available +##### Environment Variables were added but not available -If you already added the envorment variable to your CMD profile and still not being available. +If you already added the environment variable to your CMD profile and still not being available. **Solution** diff --git a/build.gradle.kts b/build.gradle.kts index 654e770de..e86bb4da3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("org.jlleitschuh.gradle.ktlint") version "11.6.1" id("maven-publish") id("org.jetbrains.kotlinx.kover") version "0.7.5" - id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1" + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("signing") id("com.android.library") version "8.1.4" apply false } @@ -181,7 +181,7 @@ nexusPublishing { repositories { sonatype { nexusUrl.set(uri("https://oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/releases/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) username.set(System.getenv("OSSRH_USERNAME")) password.set(System.getenv("OSSRH_TOKEN")) } From 23e5be8ca6601fc787e5ac0407ce3c6f01616dea Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Mon, 5 Aug 2024 15:55:26 +0700 Subject: [PATCH 05/16] feat: rollback oss.sonatype url and upgrade a gradle-release-plugin to 1.9.2 version Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 8 +++++--- package.json | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e86bb4da3..18fcf97a2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -133,8 +133,10 @@ allprojects { signing { useInMemoryPgpKeys( - project.findProperty("signing.signingSecretKey") as String? ?: System.getenv("OSSRH_GPG_SECRET_KEY"), - project.findProperty("signing.signingSecretKeyPassword") as String? ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") + project.findProperty("signing.signingSecretKey") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY"), + project.findProperty("signing.signingSecretKeyPassword") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") ) sign(this@withType) } @@ -167,7 +169,7 @@ subprojects { } exclude { it.file.toString() == "BNjs.kt" || it.file.toString() == "Curve.kt" || it.file.toString() == "PresetCurve.kt" || - it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" + it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" } exclude { it.file.toString().contains("external") diff --git a/package.json b/package.json index e70e61dbe..36f9f2d79 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "@semantic-release/changelog": "^6.0.2", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", - "gradle-semantic-release-plugin": "1.7.7", - "semantic-release": "^21.0.2", + "gradle-semantic-release-plugin": "1.9.2", + "semantic-release": "^24.0.0", "semantic-release-slack-bot": "^4.0.2" } } From f86c4a2a83ff883ba5a9841d12648043573e8f43 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Mon, 5 Aug 2024 19:01:46 +0000 Subject: [PATCH 06/16] chore(release): cut apollo version 1.4.0-beta.2 # [1.4.0-beta.2](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.1...v1.4.0-beta.2) (2024-08-05) ### Features * add --info to the CI ([b85edb7](https://github.com/hyperledger/identus-apollo/commit/b85edb717a12fabdbc8becded70b20b1cfd0e077)) * rollback oss.sonatype url and upgrade a gradle-release-plugin to 1.9.2 version ([23e5be8](https://github.com/hyperledger/identus-apollo/commit/23e5be8ca6601fc787e5ac0407ce3c6f01616dea)) Signed-off-by: Hyperledger Bot --- CHANGELOG.md | 8 ++++++++ Package.swift | 4 ++-- gradle.properties | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f46ee681..6c530d030 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# [1.4.0-beta.2](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.1...v1.4.0-beta.2) (2024-08-05) + + +### Features + +* add --info to the CI ([b85edb7](https://github.com/hyperledger/identus-apollo/commit/b85edb717a12fabdbc8becded70b20b1cfd0e077)) +* rollback oss.sonatype url and upgrade a gradle-release-plugin to 1.9.2 version ([23e5be8](https://github.com/hyperledger/identus-apollo/commit/23e5be8ca6601fc787e5ac0407ce3c6f01616dea)) + # [1.4.0-beta.1](https://github.com/hyperledger/identus-apollo/compare/v1.3.24...v1.4.0-beta.1) (2024-08-02) diff --git a/Package.swift b/Package.swift index 7aad77f3c..101abdc89 100644 --- a/Package.swift +++ b/Package.swift @@ -24,8 +24,8 @@ let package = Package( // RELEASE .binaryTarget( name: "ApolloBinary", - url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.1/Apollo.xcframework.zip", - checksum: "35b9d7dd40f140040e9f15d5401ae3be75e21cac18fb6bc0acd846b15d706ead" + url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.2/Apollo.xcframework.zip", + checksum: "7d9807c2dd739fb5b4909d214e105eb0a59732730dc9543534e7cbf38f0abd5e" ) ] ) diff --git a/gradle.properties b/gradle.properties index b506b0e8f..8a490afa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 1.4.0-beta.1 +version = 1.4.0-beta.2 org.gradle.jvmargs = -Xmx3072M -Dkotlin.daemon.jvm.options="-Xmx3072M" kotlin.code.style = official android.useAndroidX = true From 8dbd0488ca2b2409fce4eb5046806f72b8d8d08a Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Tue, 6 Aug 2024 21:35:48 +0700 Subject: [PATCH 07/16] feat: add --info to the CI Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 18fcf97a2..1da2d35cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,8 @@ allprojects { name = "OSSRH" url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2") credentials { - username = project.findProperty("sonatypeUsername") as String? ?: System.getenv("OSSRH_USERNAME") + username = + project.findProperty("sonatypeUsername") as String? ?: System.getenv("OSSRH_USERNAME") password = project.findProperty("sonatypePassword") as String? ?: System.getenv("OSSRH_TOKEN") } } @@ -168,8 +169,7 @@ subprojects { it.file.toString().contains("external") } exclude { - it.file.toString() == "BNjs.kt" || it.file.toString() == "Curve.kt" || it.file.toString() == "PresetCurve.kt" || - it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" + it.file.toString() == "BNjs.kt" || it.file.toString() == "Curve.kt" || it.file.toString() == "PresetCurve.kt" || it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" } exclude { it.file.toString().contains("external") From 1fa82054bb96cc4c219d55d2f1d255fe8e05cace Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Tue, 6 Aug 2024 22:04:57 +0700 Subject: [PATCH 08/16] feat: add --info to the CI Signed-off-by: Yurii Shynbuiev --- apollo/build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apollo/build.gradle.kts b/apollo/build.gradle.kts index 3cbb83e3a..9412999ab 100644 --- a/apollo/build.gradle.kts +++ b/apollo/build.gradle.kts @@ -931,4 +931,10 @@ afterEvaluate { this.enabled = false } } + tasks.named("runKtlintCheckOverAndroidMainSourceSet") { + enabled = false + } + tasks.named("runKtlintCheckOverJvmMainSourceSet") { + enabled = false + } } From 56824ecec1e75ca5d24ee15eec4424daacfebd42 Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Tue, 6 Aug 2024 22:10:41 +0700 Subject: [PATCH 09/16] feat: replace maven section with nexusPublishing Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 183 +++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 92 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1da2d35cc..a0f963520 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,108 +38,107 @@ allprojects { // Allowed projects to publish to maven val allowedProjectsToPublish = listOf("apollo") if (allowedProjectsToPublish.contains(project.name) && project.name.contains("androidDebug")) { - publishing { + nexusPublishing { repositories { - maven { - name = "OSSRH" - url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2") - credentials { - username = - project.findProperty("sonatypeUsername") as String? ?: System.getenv("OSSRH_USERNAME") - password = project.findProperty("sonatypePassword") as String? ?: System.getenv("OSSRH_TOKEN") - } + sonatype { + nexusUrl.set(uri("https://oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + username.set(System.getenv("OSSRH_USERNAME")) + password.set(System.getenv("OSSRH_TOKEN")) } } - publications { - withType { - groupId = publishedMavenId - artifactId = project.name - version = project.version.toString() - pom { - name.set("Identus Apollo") - description.set("Collection of the cryptographic methods used all around Identus platform") - url.set("https://docs.atalaprism.io/") - organization { - name.set("IOG") - url.set("https://iog.io/") - } - issueManagement { - system.set("Github") - url.set("https://github.com/hyperledger/identus-apollo") - } - licenses { - license { - name.set("The Apache License, Version 2.0") - url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") - } - } - developers { - developer { - id.set("hamada147") - name.set("Ahmed Moussa") - email.set("ahmed.moussa@iohk.io") - organization.set("IOG") - roles.add("developer") - url.set("https://github.com/hamada147") + publishing { + publications { + withType { + groupId = publishedMavenId + artifactId = project.name + version = project.version.toString() + pom { + name.set("Identus Apollo") + description.set("Collection of the cryptographic methods used all around Identus platform") + url.set("https://docs.atalaprism.io/") + organization { + name.set("IOG") + url.set("https://iog.io/") } - developer { - id.set("amagyar-iohk") - name.set("Allain Magyar") - email.set("allain.magyar@iohk.io") - organization.set("IOG") - roles.add("qc") + issueManagement { + system.set("Github") + url.set("https://github.com/hyperledger/identus-apollo") } - developer { - id.set("antonbaliasnikov") - name.set("Anton Baliasnikov") - email.set("anton.baliasnikov@iohk.io") - organization.set("IOG") - roles.add("qc") + licenses { + license { + name.set("The Apache License, Version 2.0") + url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") + } } - developer { - id.set("elribonazo") - name.set("Javier Ribó") - email.set("javier.ribo@iohk.io") - organization.set("IOG") - roles.add("developer") + developers { + developer { + id.set("hamada147") + name.set("Ahmed Moussa") + email.set("ahmed.moussa@iohk.io") + organization.set("IOG") + roles.add("developer") + url.set("https://github.com/hamada147") + } + developer { + id.set("amagyar-iohk") + name.set("Allain Magyar") + email.set("allain.magyar@iohk.io") + organization.set("IOG") + roles.add("qc") + } + developer { + id.set("antonbaliasnikov") + name.set("Anton Baliasnikov") + email.set("anton.baliasnikov@iohk.io") + organization.set("IOG") + roles.add("qc") + } + developer { + id.set("elribonazo") + name.set("Javier Ribó") + email.set("javier.ribo@iohk.io") + organization.set("IOG") + roles.add("developer") + } + developer { + id.set("goncalo-frade-iohk") + name.set("Gonçalo Frade") + email.set("goncalo.frade@iohk.io") + organization.set("IOG") + roles.add("developer") + } + developer { + id.set("curtis-h") + name.set("Curtis Harding") + email.set("curtis.harding@iohk.io") + organization.set("IOG") + roles.add("developer") + } + developer { + id.set("cristianIOHK") + name.set("Cristian Gonzalez") + email.set("cristian.castro@iohk.io") + organization.set("IOG") + roles.add("developer") + } } - developer { - id.set("goncalo-frade-iohk") - name.set("Gonçalo Frade") - email.set("goncalo.frade@iohk.io") - organization.set("IOG") - roles.add("developer") + scm { + connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") + developerConnection.set("scm:git:ssh://git@github.com/hyperledger/identus-apollo.git") + url.set("https://github.com/hyperledger/identus-apollo") } - developer { - id.set("curtis-h") - name.set("Curtis Harding") - email.set("curtis.harding@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("cristianIOHK") - name.set("Cristian Gonzalez") - email.set("cristian.castro@iohk.io") - organization.set("IOG") - roles.add("developer") - } - } - scm { - connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") - developerConnection.set("scm:git:ssh://git@github.com/hyperledger/identus-apollo.git") - url.set("https://github.com/hyperledger/identus-apollo") } - } - signing { - useInMemoryPgpKeys( - project.findProperty("signing.signingSecretKey") as String? - ?: System.getenv("OSSRH_GPG_SECRET_KEY"), - project.findProperty("signing.signingSecretKeyPassword") as String? - ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") - ) - sign(this@withType) + signing { + useInMemoryPgpKeys( + project.findProperty("signing.signingSecretKey") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY"), + project.findProperty("signing.signingSecretKeyPassword") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") + ) + sign(this@withType) + } } } } From b9c27e7932cb950c4233fc1f07fd66ac36798db1 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Tue, 6 Aug 2024 15:43:01 +0000 Subject: [PATCH 10/16] chore(release): cut apollo version 1.4.0-beta.3 # [1.4.0-beta.3](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.2...v1.4.0-beta.3) (2024-08-06) ### Features * add --info to the CI ([1fa8205](https://github.com/hyperledger/identus-apollo/commit/1fa82054bb96cc4c219d55d2f1d255fe8e05cace)) * add --info to the CI ([8dbd048](https://github.com/hyperledger/identus-apollo/commit/8dbd0488ca2b2409fce4eb5046806f72b8d8d08a)) * replace maven section with nexusPublishing ([56824ec](https://github.com/hyperledger/identus-apollo/commit/56824ecec1e75ca5d24ee15eec4424daacfebd42)) Signed-off-by: Hyperledger Bot --- CHANGELOG.md | 9 +++++++++ Package.swift | 4 ++-- gradle.properties | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c530d030..a0f4d9fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# [1.4.0-beta.3](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.2...v1.4.0-beta.3) (2024-08-06) + + +### Features + +* add --info to the CI ([1fa8205](https://github.com/hyperledger/identus-apollo/commit/1fa82054bb96cc4c219d55d2f1d255fe8e05cace)) +* add --info to the CI ([8dbd048](https://github.com/hyperledger/identus-apollo/commit/8dbd0488ca2b2409fce4eb5046806f72b8d8d08a)) +* replace maven section with nexusPublishing ([56824ec](https://github.com/hyperledger/identus-apollo/commit/56824ecec1e75ca5d24ee15eec4424daacfebd42)) + # [1.4.0-beta.2](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.1...v1.4.0-beta.2) (2024-08-05) diff --git a/Package.swift b/Package.swift index 101abdc89..c433aab0e 100644 --- a/Package.swift +++ b/Package.swift @@ -24,8 +24,8 @@ let package = Package( // RELEASE .binaryTarget( name: "ApolloBinary", - url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.2/Apollo.xcframework.zip", - checksum: "7d9807c2dd739fb5b4909d214e105eb0a59732730dc9543534e7cbf38f0abd5e" + url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.3/Apollo.xcframework.zip", + checksum: "ea0872b18618df459a42ce3ce43e5c84a69829053fc1796aa2b1c33d3562f604" ) ] ) diff --git a/gradle.properties b/gradle.properties index 8a490afa6..49c31ee59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 1.4.0-beta.2 +version = 1.4.0-beta.3 org.gradle.jvmargs = -Xmx3072M -Dkotlin.daemon.jvm.options="-Xmx3072M" kotlin.code.style = official android.useAndroidX = true From 2e1ee7dc3c949062b68c72c17b2191de510f2aa5 Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Wed, 7 Aug 2024 01:06:23 +0700 Subject: [PATCH 11/16] feat: publish update Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 199 +++++++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 94 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a0f963520..f984b981b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,108 +38,119 @@ allprojects { // Allowed projects to publish to maven val allowedProjectsToPublish = listOf("apollo") if (allowedProjectsToPublish.contains(project.name) && project.name.contains("androidDebug")) { - nexusPublishing { - repositories { - sonatype { - nexusUrl.set(uri("https://oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - username.set(System.getenv("OSSRH_USERNAME")) - password.set(System.getenv("OSSRH_TOKEN")) - } - } - publishing { - publications { - withType { - groupId = publishedMavenId - artifactId = project.name - version = project.version.toString() - pom { - name.set("Identus Apollo") - description.set("Collection of the cryptographic methods used all around Identus platform") - url.set("https://docs.atalaprism.io/") - organization { - name.set("IOG") - url.set("https://iog.io/") + println("!!!!!!!!!!!!!!! Publishing ${project.name} to maven") + publishing { + publications.withType { + groupId = publishedMavenId + artifactId = project.name + version = project.version.toString() + pom { + name.set("Identus Apollo") + description.set("Collection of the cryptographic methods used all around Identus platform") + url.set("https://docs.atalaprism.io/") + organization { + name.set("Hyperledger") + url.set("https://www.hyperledger.org/") + } + issueManagement { + system.set("Github") + url.set("https://github.com/hyperledger/identus-apollo") + } + licenses { + license { + name.set("The Apache License, Version 2.0") + url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") + } + } + developers { + developer { + id.set("hamada147") + name.set("Ahmed Moussa") + email.set("ahmed.moussa@iohk.io") + organization.set("IOG") + roles.add("developer") + url.set("https://github.com/hamada147") + } + developer { + id.set("amagyar-iohk") + name.set("Allain Magyar") + email.set("allain.magyar@iohk.io") + organization.set("IOG") + roles.add("qc") + } + developer { + id.set("antonbaliasnikov") + name.set("Anton Baliasnikov") + email.set("anton.baliasnikov@iohk.io") + organization.set("IOG") + roles.add("qc") } - issueManagement { - system.set("Github") - url.set("https://github.com/hyperledger/identus-apollo") + developer { + id.set("elribonazo") + name.set("Javier Ribó") + email.set("javier.ribo@iohk.io") + organization.set("IOG") + roles.add("developer") } - licenses { - license { - name.set("The Apache License, Version 2.0") - url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") - } + developer { + id.set("goncalo-frade-iohk") + name.set("Gonçalo Frade") + email.set("goncalo.frade@iohk.io") + organization.set("IOG") + roles.add("developer") } - developers { - developer { - id.set("hamada147") - name.set("Ahmed Moussa") - email.set("ahmed.moussa@iohk.io") - organization.set("IOG") - roles.add("developer") - url.set("https://github.com/hamada147") - } - developer { - id.set("amagyar-iohk") - name.set("Allain Magyar") - email.set("allain.magyar@iohk.io") - organization.set("IOG") - roles.add("qc") - } - developer { - id.set("antonbaliasnikov") - name.set("Anton Baliasnikov") - email.set("anton.baliasnikov@iohk.io") - organization.set("IOG") - roles.add("qc") - } - developer { - id.set("elribonazo") - name.set("Javier Ribó") - email.set("javier.ribo@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("goncalo-frade-iohk") - name.set("Gonçalo Frade") - email.set("goncalo.frade@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("curtis-h") - name.set("Curtis Harding") - email.set("curtis.harding@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("cristianIOHK") - name.set("Cristian Gonzalez") - email.set("cristian.castro@iohk.io") - organization.set("IOG") - roles.add("developer") - } + developer { + id.set("curtis-h") + name.set("Curtis Harding") + email.set("curtis.harding@iohk.io") + organization.set("IOG") + roles.add("developer") } - scm { - connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") - developerConnection.set("scm:git:ssh://git@github.com/hyperledger/identus-apollo.git") - url.set("https://github.com/hyperledger/identus-apollo") + developer { + id.set("cristianIOHK") + name.set("Cristian Gonzalez") + email.set("cristian.castro@iohk.io") + organization.set("IOG") + roles.add("developer") } } - - signing { - useInMemoryPgpKeys( - project.findProperty("signing.signingSecretKey") as String? - ?: System.getenv("OSSRH_GPG_SECRET_KEY"), - project.findProperty("signing.signingSecretKeyPassword") as String? - ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") - ) - sign(this@withType) + scm { + connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") + developerConnection.set("scm:git:ssh://git@github.com/hyperledger/identus-apollo.git") + url.set("https://github.com/hyperledger/identus-apollo") } } + + signing { + useInMemoryPgpKeys( + project.findProperty("signing.signingSecretKey") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY"), + project.findProperty("signing.signingSecretKeyPassword") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") + ) + sign(this@withType) + } + } + publications { + create("jvm") { + from(components["java"]) + groupId = publishedMavenId + artifactId = "apollo-jvm" + version = project.version.toString() + } + + create("androidDebug") { + from(components["androidDebug"]) + groupId = publishedMavenId + artifactId = "apollo-android-debug" + version = project.version.toString() + } + + create("androidRelease") { + from(components["androidRelease"]) + groupId = publishedMavenId + artifactId = "apollo-android" + version = project.version.toString() } } } From 31f0161d89ccbc8eb94adbbaae90c96d5fb6508e Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Wed, 7 Aug 2024 01:29:48 +0700 Subject: [PATCH 12/16] feat: update the publishing info Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 218 +++++++++++++++++++++++------------------------ 1 file changed, 107 insertions(+), 111 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f984b981b..b7a65382d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,123 +35,119 @@ allprojects { apply(plugin = "org.gradle.maven-publish") apply(plugin = "org.gradle.signing") - // Allowed projects to publish to maven - val allowedProjectsToPublish = listOf("apollo") - if (allowedProjectsToPublish.contains(project.name) && project.name.contains("androidDebug")) { - println("!!!!!!!!!!!!!!! Publishing ${project.name} to maven") - publishing { - publications.withType { - groupId = publishedMavenId - artifactId = project.name - version = project.version.toString() - pom { - name.set("Identus Apollo") - description.set("Collection of the cryptographic methods used all around Identus platform") - url.set("https://docs.atalaprism.io/") - organization { - name.set("Hyperledger") - url.set("https://www.hyperledger.org/") - } - issueManagement { - system.set("Github") - url.set("https://github.com/hyperledger/identus-apollo") - } - licenses { - license { - name.set("The Apache License, Version 2.0") - url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") - } - } - developers { - developer { - id.set("hamada147") - name.set("Ahmed Moussa") - email.set("ahmed.moussa@iohk.io") - organization.set("IOG") - roles.add("developer") - url.set("https://github.com/hamada147") - } - developer { - id.set("amagyar-iohk") - name.set("Allain Magyar") - email.set("allain.magyar@iohk.io") - organization.set("IOG") - roles.add("qc") - } - developer { - id.set("antonbaliasnikov") - name.set("Anton Baliasnikov") - email.set("anton.baliasnikov@iohk.io") - organization.set("IOG") - roles.add("qc") - } - developer { - id.set("elribonazo") - name.set("Javier Ribó") - email.set("javier.ribo@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("goncalo-frade-iohk") - name.set("Gonçalo Frade") - email.set("goncalo.frade@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("curtis-h") - name.set("Curtis Harding") - email.set("curtis.harding@iohk.io") - organization.set("IOG") - roles.add("developer") - } - developer { - id.set("cristianIOHK") - name.set("Cristian Gonzalez") - email.set("cristian.castro@iohk.io") - organization.set("IOG") - roles.add("developer") - } - } - scm { - connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") - developerConnection.set("scm:git:ssh://git@github.com/hyperledger/identus-apollo.git") - url.set("https://github.com/hyperledger/identus-apollo") - } + publishing { + publications.withType { + groupId = publishedMavenId + artifactId = project.name + version = project.version.toString() + pom { + name.set("Identus Apollo") + description.set("Collection of the cryptographic methods used all around Identus platform") + url.set("https://docs.atalaprism.io/") + organization { + name.set("Hyperledger") + url.set("https://www.hyperledger.org/") + } + issueManagement { + system.set("Github") + url.set("https://github.com/hyperledger/identus-apollo") + } + licenses { + license { + name.set("The Apache License, Version 2.0") + url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") } - - signing { - useInMemoryPgpKeys( - project.findProperty("signing.signingSecretKey") as String? - ?: System.getenv("OSSRH_GPG_SECRET_KEY"), - project.findProperty("signing.signingSecretKeyPassword") as String? - ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") - ) - sign(this@withType) + } + developers { + developer { + id.set("hamada147") + name.set("Ahmed Moussa") + email.set("ahmed.moussa@iohk.io") + organization.set("IOG") + roles.add("developer") + url.set("https://github.com/hamada147") + } + developer { + id.set("amagyar-iohk") + name.set("Allain Magyar") + email.set("allain.magyar@iohk.io") + organization.set("IOG") + roles.add("qc") + } + developer { + id.set("antonbaliasnikov") + name.set("Anton Baliasnikov") + email.set("anton.baliasnikov@iohk.io") + organization.set("IOG") + roles.add("qc") + } + developer { + id.set("elribonazo") + name.set("Javier Ribó") + email.set("javier.ribo@iohk.io") + organization.set("IOG") + roles.add("developer") + } + developer { + id.set("goncalo-frade-iohk") + name.set("Gonçalo Frade") + email.set("goncalo.frade@iohk.io") + organization.set("IOG") + roles.add("developer") + } + developer { + id.set("curtis-h") + name.set("Curtis Harding") + email.set("curtis.harding@iohk.io") + organization.set("IOG") + roles.add("developer") + } + developer { + id.set("cristianIOHK") + name.set("Cristian Gonzalez") + email.set("cristian.castro@iohk.io") + organization.set("IOG") + roles.add("developer") } } - publications { - create("jvm") { - from(components["java"]) - groupId = publishedMavenId - artifactId = "apollo-jvm" - version = project.version.toString() + scm { + connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") + developerConnection.set("scm:git:ssh://git@github.com/hyperledger/identus-apollo.git") + url.set("https://github.com/hyperledger/identus-apollo") } + } - create("androidDebug") { - from(components["androidDebug"]) - groupId = publishedMavenId - artifactId = "apollo-android-debug" - version = project.version.toString() - } +// publications { +// create("jvm") { +// from(components["java"]) +// groupId = publishedMavenId +// artifactId = "apollo-jvm" +// version = project.version.toString() +// } +// +// create("androidDebug") { +// from(components["androidDebug"]) +// groupId = publishedMavenId +// artifactId = "apollo-android-debug" +// version = project.version.toString() +// } +// +// create("androidRelease") { +// from(components["androidRelease"]) +// groupId = publishedMavenId +// artifactId = "apollo-android" +// version = project.version.toString() +// } +// } - create("androidRelease") { - from(components["androidRelease"]) - groupId = publishedMavenId - artifactId = "apollo-android" - version = project.version.toString() - } + signing { + useInMemoryPgpKeys( + project.findProperty("signing.signingSecretKey") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY"), + project.findProperty("signing.signingSecretKeyPassword") as String? + ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") + ) + sign(this@withType) } } } From 9d062724419110b369cf3e3dd7765072a9de90c7 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Tue, 6 Aug 2024 19:25:24 +0000 Subject: [PATCH 13/16] chore(release): cut apollo version 1.4.0-beta.4 # [1.4.0-beta.4](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.3...v1.4.0-beta.4) (2024-08-06) ### Features * publish update ([2e1ee7d](https://github.com/hyperledger/identus-apollo/commit/2e1ee7dc3c949062b68c72c17b2191de510f2aa5)) * update the publishing info ([31f0161](https://github.com/hyperledger/identus-apollo/commit/31f0161d89ccbc8eb94adbbaae90c96d5fb6508e)) Signed-off-by: Hyperledger Bot --- CHANGELOG.md | 8 ++++++++ Package.swift | 4 ++-- gradle.properties | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0f4d9fc3..991dba81f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# [1.4.0-beta.4](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.3...v1.4.0-beta.4) (2024-08-06) + + +### Features + +* publish update ([2e1ee7d](https://github.com/hyperledger/identus-apollo/commit/2e1ee7dc3c949062b68c72c17b2191de510f2aa5)) +* update the publishing info ([31f0161](https://github.com/hyperledger/identus-apollo/commit/31f0161d89ccbc8eb94adbbaae90c96d5fb6508e)) + # [1.4.0-beta.3](https://github.com/hyperledger/identus-apollo/compare/v1.4.0-beta.2...v1.4.0-beta.3) (2024-08-06) diff --git a/Package.swift b/Package.swift index c433aab0e..b65193662 100644 --- a/Package.swift +++ b/Package.swift @@ -24,8 +24,8 @@ let package = Package( // RELEASE .binaryTarget( name: "ApolloBinary", - url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.3/Apollo.xcframework.zip", - checksum: "ea0872b18618df459a42ce3ce43e5c84a69829053fc1796aa2b1c33d3562f604" + url: "https://github.com/hyperledger/identus-apollo/releases/download/v1.4.0-beta.4/Apollo.xcframework.zip", + checksum: "7a7070fe87ad4e9d5f26eb11e080183f7e02d40f6fd7c9a276cee7aeea9f89b0" ) ] ) diff --git a/gradle.properties b/gradle.properties index 49c31ee59..2ab4af87a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 1.4.0-beta.3 +version = 1.4.0-beta.4 org.gradle.jvmargs = -Xmx3072M -Dkotlin.daemon.jvm.options="-Xmx3072M" kotlin.code.style = official android.useAndroidX = true From 06e7e8906cf745fedab8760fdafad7163acfe490 Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Wed, 7 Aug 2024 13:01:46 +0700 Subject: [PATCH 14/16] feat: cleanup the branch and prepare for PR Signed-off-by: Yurii Shynbuiev --- .github/workflows/release.yml | 5 +++-- apollo/build.gradle.kts | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f48c92b5..4bbfd54f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,7 @@ jobs: - name: "Install Java ${{ env.JAVA_VERSION }}" uses: actions/setup-java@v4 + continue-on-error: true with: java-version: "${{ env.JAVA_VERSION }}" distribution: zulu @@ -106,7 +107,7 @@ jobs: id: import_gpg with: gpg_private_key: ${{ secrets.HYP_BOT_GPG_PRIVATE }} - passphrase: ${{ secrets.HYP_BOT_GPG_PASSWORD }} + passphrase: ${{ secrets.HYP_BOT_GPG_PASSWORD }} git_user_signingkey: true git_commit_gpgsign: true git_config_global: true @@ -136,4 +137,4 @@ jobs: OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} run: | npm install - npx semantic-release --info + npx semantic-release diff --git a/apollo/build.gradle.kts b/apollo/build.gradle.kts index 9412999ab..3cbb83e3a 100644 --- a/apollo/build.gradle.kts +++ b/apollo/build.gradle.kts @@ -931,10 +931,4 @@ afterEvaluate { this.enabled = false } } - tasks.named("runKtlintCheckOverAndroidMainSourceSet") { - enabled = false - } - tasks.named("runKtlintCheckOverJvmMainSourceSet") { - enabled = false - } } From 460c07d70a1a44e71023e3a870cb657e74b03216 Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Wed, 7 Aug 2024 13:14:39 +0700 Subject: [PATCH 15/16] chore: fix build.gradle.kts file after merging Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 19304eeed..67eab6903 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -109,6 +109,13 @@ allprojects { organization.set("IOG") roles.add("developer") } + developer { + id.set("yshyn-iohk") + name.set("Yurii Shynbuiev") + email.set("yurii.shynbuiev@iohk.io") + organization.set("IOG") + roles.add("developer") + } } scm { connection.set("scm:git:git://git@github.com/hyperledger/identus-apollo.git") @@ -117,14 +124,12 @@ allprojects { } } - signing { - useInMemoryPgpKeys( - project.findProperty("signing.signingSecretKey") as String? ?: System.getenv("OSSRH_GPG_SECRET_KEY"), - project.findProperty("signing.signingSecretKeyPassword") as String? ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") - ) - sign(this@withType) - } - } + signing { + useInMemoryPgpKeys( + project.findProperty("signing.signingSecretKey") as String? ?: System.getenv("OSSRH_GPG_SECRET_KEY"), + project.findProperty("signing.signingSecretKeyPassword") as String? ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD") + ) + sign(this@withType) } } } @@ -153,7 +158,7 @@ subprojects { } exclude { it.file.toString() == "BNjs.kt" || it.file.toString() == "Curve.kt" || it.file.toString() == "PresetCurve.kt" || - it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" + it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" } exclude { it.file.toString().contains("external") From e656c53a640721425c033ba55e9cad1a258d957f Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Wed, 7 Aug 2024 13:24:54 +0700 Subject: [PATCH 16/16] fix: formatting in the build.gradle.kts file Signed-off-by: Yurii Shynbuiev --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 67eab6903..3205f8a78 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -158,7 +158,7 @@ subprojects { } exclude { it.file.toString() == "BNjs.kt" || it.file.toString() == "Curve.kt" || it.file.toString() == "PresetCurve.kt" || - it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" + it.file.toString() == "Ellipticjs.kt" || it.file.toString() == "secp256k1js.kt" } exclude { it.file.toString().contains("external")