From 21eb714af79a3a8dc0f8a7548afa300b59a0750d Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Fri, 1 Oct 2021 18:23:10 +0300 Subject: [PATCH 1/6] improves packaging and publishing Signed-off-by: Andrey Kononykhin --- .github/workflows/release.yml | 54 +++++++++++++++++++++-------------- gradle.properties | 3 +- lib/build.gradle | 26 ++++++++++------- 3 files changed, 50 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d827b5c..059824b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,6 @@ on: # required: false # default: '0' -env: - PKG_NAME: didcomm - PKG_GROUP: org.dif - jobs: checks: @@ -20,7 +16,9 @@ jobs: if: github.ref == 'refs/heads/stable' runs-on: ubuntu-latest outputs: - current_version: ${{ steps.current_version.outputs.current_version }} + proj_group: ${{ steps.proj_meta.outputs.proj_group }} + proj_artifactId: ${{ steps.proj_meta.outputs.proj_artifactId }} + current_version: ${{ steps.proj_meta.outputs.current_version }} release_info: ${{ steps.release_info.outputs.release_info }} asset_jar_url: ${{ steps.release_info.outputs.asset_jar_url }} upload_url: ${{ steps.release_info.outputs.upload_url }} @@ -30,8 +28,16 @@ jobs: - uses: actions/checkout@v2 - name: Get the metadata - id: current_version + id: proj_meta run: | + group="$(gradle -q group)" + echo "$group" + echo "::set-output name=proj_group::$group" + + artifactId="$(gradle -q artifactId)" + echo "$artifactId" + echo "::set-output name=proj_artifactId::$artifactId" + version="$(gradle -q version)" echo "$version" echo "::set-output name=current_version::$version" @@ -41,12 +47,12 @@ jobs: id: release_info run: | release_info="$(curl -s https://api.github.com/repos/${{ github.repository }}/releases \ - | jq '.[] | select(.name == "v${{ steps.current_version.outputs.current_version }}")')" + | jq '.[] | select(.name == "v${{ steps.proj_meta.outputs.current_version }}")')" echo "::set-output name=release_info::$release_info" echo "$release_info" asset_jar_url="$(echo "$release_info" \ - | jq -r '.assets[] | select(.name | match("^${{ env.PKG_NAME }}.*\\.jar$")) | .browser_download_url')" + | jq -r '.assets[] | select(.name | match("^${{ steps.proj_meta.outputs.proj_artifactId }}.*\\.jar$")) | .browser_download_url')" echo "::set-output name=asset_jar_url::$asset_jar_url" echo "$asset_jar_url" @@ -58,7 +64,7 @@ jobs: - name: check if already deployed to Maven Central id: check_in_maven run: | - out="$(curl -s 'https://search.maven.org/solrsearch/select?q=a:${{ env.PKG_NAME }}+AND+g:${{ env.PKG_GROUP }}+AND+v:${{ steps.current_version.outputs.current_version }}&wt=json' \ + out="$(curl -s 'https://search.maven.org/solrsearch/select?q=a:${{ steps.proj_meta.outputs.proj_artifactId }}+AND+g:${{ steps.proj_meta.outputs.proj_group }}+AND+v:${{ steps.proj_meta.outputs.current_version }}&wt=json' \ | jq -r '.response | .docs[] | .v')" echo "in maven check: $out" echo "::set-output name=already_in_maven::$out" @@ -85,7 +91,7 @@ jobs: run: | gradle jar ls lib/build/libs - asset_jar_name="$(find lib/build/libs -name '*${{ steps.current_version.outputs.current_version }}.jar' -printf '%f')" + asset_jar_name="$(find lib/build/libs -name '*${{ steps.proj_meta.outputs.current_version }}.jar' -printf '%f')" echo "::set-output name=asset_jar_name::$asset_jar_name" shell: bash @@ -127,11 +133,14 @@ jobs: - name: Publish to Maven Central if: needs.checks.outputs.already_in_maven == 'false' env: - ORG_GRADLE_PROJECT_mavenOSSRHUsername: ${{ secrets.ORG_GRADLE_PROJECT_mavenOSSRHUsername }} - ORG_GRADLE_PROJECT_mavenOSSRHPassword: ${{ secrets.ORG_GRADLE_PROJECT_mavenOSSRHPassword }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.ORG_GRADLE_PROJECT_signingKeyId }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_signingKey }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_signingPassword }} + # maven user creds + ORG_GRADLE_PROJECT_mavenOSSRHUsername: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_mavenOSSRHPassword: ${{ secrets.MAVEN_PASSWORD }} + # creds of for an ascii-armored GPG subkey to sign for Maven + # https://docs.gradle.org/current/userguide/signing_plugin.html#using_in_memory_ascii_armored_openpgp_subkeys + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.MAVEN_GPG_ARMORED_KEY_ID }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVEN_GPG_ARMORED_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_GPG_PASSWORD }} run: gradle publish shell: bash @@ -142,13 +151,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set dev version - run: | - # TODO decide - # sed -i -r "s~^version=(.+)~version=\1-0.dev.${{ github.event.inputs.devN }}~" ./gradle.properties - sed -i -r "s~^version=(.+)~version=\1-SNAPSHOT~" ./gradle.properties - grep version ./gradle.properties - shell: bash + # NOTE it's always in SNAPSHOT state for now + # - name: set SNAPSHOT version + # run: | + # # TODO decide + # # sed -i -r "s~^version=(.+)~version=\1-0.dev.${{ github.event.inputs.devN }}~" ./gradle.properties + # sed -i -r "s~^version=(.+)~version=\1-SNAPSHOT~" ./gradle.properties + # grep version ./gradle.properties + # shell: bash # XXX do we need that here - name: Set up JDK 8 diff --git a/gradle.properties b/gradle.properties index b7506c9..751a841 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,9 +20,10 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +version=0.1.0-SNAPSHOT + kotlinJvm=1.5.21 jvmTarget=1.8 -version=0.1-SNAPSHOT nimbusJoseJWTVersion=9.14-SNAPSHOT ktlintGradle=10.1.0 googleTinkVersion=1.6.1 diff --git a/lib/build.gradle b/lib/build.gradle index c0c4c2b..e702268 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -8,8 +8,10 @@ plugins { id 'signing' } -group = "org.didcommx.didcomm" +group = "org.didcommx" version = "${version}" +project.ext.artifactId = rootProject.name +archivesBaseName = project.artifactId kotlin { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -43,11 +45,6 @@ compileTestKotlin { kotlinOptions.jvmTarget = "${jvmTarget}" } -jar { - // FIXME deprecated https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Jar.html - baseName "${rootProject.name}" -} - // TODO tune settings jmh { benchmarkMode = ["thrpt", "avgt"] @@ -66,6 +63,17 @@ java { withSourcesJar() } +task group { + doLast { + println(project.group) + } +} + +task artifactId { + doLast { + println(project.artifactId) + } +} task version { doLast { @@ -73,12 +81,10 @@ task version { } } - - publishing { publications { maven(MavenPublication) { - artifactId = "${rootProject.name}" + artifactId = project.artifactId from components.java pom { @@ -133,7 +139,7 @@ signing { useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) // TODO test signing - // sign publishing.publications.maven + sign publishing.publications.maven } From 0722aa9ffcb6e09eb7edc674dc61b94eac22ed32 Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Fri, 1 Oct 2021 19:17:05 +0300 Subject: [PATCH 2/6] improves android builds Signed-off-by: Andrey Kononykhin --- docs/testing.md | 5 +++-- gradle.properties | 1 + lib/src/test/kotlin/org/didcommx/DIDCommTest.kt | 2 +- settings.gradle | 8 ++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/testing.md b/docs/testing.md index c6ae544..85f9389 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -48,7 +48,8 @@ Requirements: Preparation steps: -* enable `benchmark` project in [settings.gradle](../settings.gradle) +* enable `benchmark` project in using Gradle property `androidBuilds=true` + (e.g. in [gradle.properties](../gradle.properties) or via CLI option `-PandroidBuilds=true`) * enable benchmark tests in [DIDCommBenchAndroidNaive.kt](../benchmark/src/androidTest/kotlin/org/dif/DIDCommBenchAndroidNaive.kt) * ensure that either an emulator is [available](https://developer.android.com/studio/run/managing-avds) or real Android device is [attached](https://developer.android.com/studio/run/device) @@ -58,5 +59,5 @@ Run: * using gradle ```bash - ./gradlew :benchmark:cleanConnectedAndroidTest :benchmark:connectedAndroidTest --info + ./gradlew -PandroidBuilds=true :benchmark:cleanConnectedAndroidTest :benchmark:connectedAndroidTest --info ``` diff --git a/gradle.properties b/gradle.properties index 751a841..9ab5586 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,3 +34,4 @@ mannodermausJUnit5=1.8.0.0 androidxTestRunner=1.4.0 jUnitJupiter=5.8.0 mannodermausJUunit5AndroidTest=1.3.0 +# androidBuilds=true diff --git a/lib/src/test/kotlin/org/didcommx/DIDCommTest.kt b/lib/src/test/kotlin/org/didcommx/DIDCommTest.kt index fce01ec..2f5ce8a 100644 --- a/lib/src/test/kotlin/org/didcommx/DIDCommTest.kt +++ b/lib/src/test/kotlin/org/didcommx/DIDCommTest.kt @@ -197,7 +197,7 @@ class DIDCommTest { } @Test - fun `Test multi recipient support`() { + fun `Test_multi_recipient_support`() { val didComm = DIDComm(DIDDocResolverMock(), AliceSecretResolverMock()) val packResultBob = didComm.packEncrypted( diff --git a/settings.gradle b/settings.gradle index a286af8..d49dc97 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,10 @@ rootProject.name = 'didcomm' include ':lib' +def androidBuilds = this.properties['androidBuilds'] ?: false + // NOTE android libraries require jdk >= 11 -//include ':android' -//include ':benchmark' +if (androidBuilds) { + include ':android' + include ':benchmark' +} From 59cf5bffa793124dc157459b9bf2c62c827d8581 Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Sat, 2 Oct 2021 15:42:01 +0300 Subject: [PATCH 3/6] improves android projects names Signed-off-by: Andrey Kononykhin --- {benchmark => android-benchmark}/build.gradle | 0 .../src/androidTest/AndroidManifest.xml | 0 .../kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt | 0 .../src/main/AndroidManifest.xml | 0 {android => android-test}/build.gradle | 0 {android => android-test}/src/main/AndroidManifest.xml | 0 docs/testing.md | 6 +++--- settings.gradle | 4 ++-- 8 files changed, 5 insertions(+), 5 deletions(-) rename {benchmark => android-benchmark}/build.gradle (100%) rename {benchmark => android-benchmark}/src/androidTest/AndroidManifest.xml (100%) rename {benchmark => android-benchmark}/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt (100%) rename {benchmark => android-benchmark}/src/main/AndroidManifest.xml (100%) rename {android => android-test}/build.gradle (100%) rename {android => android-test}/src/main/AndroidManifest.xml (100%) diff --git a/benchmark/build.gradle b/android-benchmark/build.gradle similarity index 100% rename from benchmark/build.gradle rename to android-benchmark/build.gradle diff --git a/benchmark/src/androidTest/AndroidManifest.xml b/android-benchmark/src/androidTest/AndroidManifest.xml similarity index 100% rename from benchmark/src/androidTest/AndroidManifest.xml rename to android-benchmark/src/androidTest/AndroidManifest.xml diff --git a/benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt b/android-benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt similarity index 100% rename from benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt rename to android-benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt diff --git a/benchmark/src/main/AndroidManifest.xml b/android-benchmark/src/main/AndroidManifest.xml similarity index 100% rename from benchmark/src/main/AndroidManifest.xml rename to android-benchmark/src/main/AndroidManifest.xml diff --git a/android/build.gradle b/android-test/build.gradle similarity index 100% rename from android/build.gradle rename to android-test/build.gradle diff --git a/android/src/main/AndroidManifest.xml b/android-test/src/main/AndroidManifest.xml similarity index 100% rename from android/src/main/AndroidManifest.xml rename to android-test/src/main/AndroidManifest.xml diff --git a/docs/testing.md b/docs/testing.md index 85f9389..f5803ee 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -48,9 +48,9 @@ Requirements: Preparation steps: -* enable `benchmark` project in using Gradle property `androidBuilds=true` +* enable `android-benchmark` project using Gradle property `androidBuilds=true` (e.g. in [gradle.properties](../gradle.properties) or via CLI option `-PandroidBuilds=true`) -* enable benchmark tests in [DIDCommBenchAndroidNaive.kt](../benchmark/src/androidTest/kotlin/org/dif/DIDCommBenchAndroidNaive.kt) +* enable benchmark tests in [DIDCommBenchAndroidNaive.kt](../android-benchmark/src/androidTest/kotlin/org/dif/DIDCommBenchAndroidNaive.kt) * ensure that either an emulator is [available](https://developer.android.com/studio/run/managing-avds) or real Android device is [attached](https://developer.android.com/studio/run/device) Run: @@ -59,5 +59,5 @@ Run: * using gradle ```bash - ./gradlew -PandroidBuilds=true :benchmark:cleanConnectedAndroidTest :benchmark:connectedAndroidTest --info + ./gradlew -PandroidBuilds=true :android-benchmark:cleanConnectedAndroidTest :android-benchmark:connectedAndroidTest --info ``` diff --git a/settings.gradle b/settings.gradle index d49dc97..c062b31 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,6 +18,6 @@ def androidBuilds = this.properties['androidBuilds'] ?: false // NOTE android libraries require jdk >= 11 if (androidBuilds) { - include ':android' - include ':benchmark' + include ':android-test' + include ':android-benchmark' } From 80c7554207505b919d381f22bd130629031c6f6e Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Sun, 3 Oct 2021 16:12:39 +0300 Subject: [PATCH 4/6] fixes project layout Signed-off-by: Andrey Kononykhin --- .github/workflows/verify.yml | 3 --- .../{ => didcomm/benchmark}/DIDCommBenchAndroidNaive.kt | 0 .../didcommx/{ => didcomm/jmh}/DIDCommBenchPackEncrypted.kt | 0 .../org/didcommx/{ => didcomm/jmh}/DIDCommBenchPackSigned.kt | 0 .../org/didcommx/{ => didcomm/jmh}/DIDCommBenchUnpack.kt | 0 .../org/didcommx/{ => didcomm}/DIDCommBenchmarkJVMNaive.kt | 0 lib/src/test/kotlin/org/didcommx/{ => didcomm}/DIDCommTest.kt | 0 .../kotlin/org/didcommx/{ => didcomm}/EncryptedMessageTest.kt | 0 .../kotlin/org/didcommx/{ => didcomm}/PlaintextMessageTest.kt | 0 .../kotlin/org/didcommx/{ => didcomm}/SignedMessageTest.kt | 0 .../{ => didcomm}/crypto/key/RecipientKeySelectorTest.kt | 0 .../didcommx/{ => didcomm}/crypto/key/SenderKeySelectorTest.kt | 0 .../kotlin/org/didcommx/{ => didcomm}/fixtures/BenchCommon.kt | 0 .../kotlin/org/didcommx/{ => didcomm}/fixtures/Fixtures.kt | 0 .../org/didcommx/{ => didcomm}/mock/AliceSecretResolverMock.kt | 0 .../org/didcommx/{ => didcomm}/mock/BobSecretResolverMock.kt | 0 .../didcommx/{ => didcomm}/mock/CharlieSecretResolverMock.kt | 0 .../org/didcommx/{ => didcomm}/mock/DIDDocResolverMock.kt | 0 18 files changed, 3 deletions(-) rename android-benchmark/src/androidTest/kotlin/org/didcommx/{ => didcomm/benchmark}/DIDCommBenchAndroidNaive.kt (100%) rename lib/src/jmh/kotlin/org/didcommx/{ => didcomm/jmh}/DIDCommBenchPackEncrypted.kt (100%) rename lib/src/jmh/kotlin/org/didcommx/{ => didcomm/jmh}/DIDCommBenchPackSigned.kt (100%) rename lib/src/jmh/kotlin/org/didcommx/{ => didcomm/jmh}/DIDCommBenchUnpack.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/DIDCommBenchmarkJVMNaive.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/DIDCommTest.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/EncryptedMessageTest.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/PlaintextMessageTest.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/SignedMessageTest.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/crypto/key/RecipientKeySelectorTest.kt (100%) rename lib/src/test/kotlin/org/didcommx/{ => didcomm}/crypto/key/SenderKeySelectorTest.kt (100%) rename lib/src/testCommon/kotlin/org/didcommx/{ => didcomm}/fixtures/BenchCommon.kt (100%) rename lib/src/testCommon/kotlin/org/didcommx/{ => didcomm}/fixtures/Fixtures.kt (100%) rename lib/src/testCommon/kotlin/org/didcommx/{ => didcomm}/mock/AliceSecretResolverMock.kt (100%) rename lib/src/testCommon/kotlin/org/didcommx/{ => didcomm}/mock/BobSecretResolverMock.kt (100%) rename lib/src/testCommon/kotlin/org/didcommx/{ => didcomm}/mock/CharlieSecretResolverMock.kt (100%) rename lib/src/testCommon/kotlin/org/didcommx/{ => didcomm}/mock/DIDDocResolverMock.kt (100%) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 1eb6c46..b363fc7 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -2,9 +2,6 @@ name: verify on: [ pull_request ] -env: - PKG_NAME: didcomm - jobs: diff --git a/android-benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt b/android-benchmark/src/androidTest/kotlin/org/didcommx/didcomm/benchmark/DIDCommBenchAndroidNaive.kt similarity index 100% rename from android-benchmark/src/androidTest/kotlin/org/didcommx/DIDCommBenchAndroidNaive.kt rename to android-benchmark/src/androidTest/kotlin/org/didcommx/didcomm/benchmark/DIDCommBenchAndroidNaive.kt diff --git a/lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackEncrypted.kt b/lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackEncrypted.kt similarity index 100% rename from lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackEncrypted.kt rename to lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackEncrypted.kt diff --git a/lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackSigned.kt b/lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackSigned.kt similarity index 100% rename from lib/src/jmh/kotlin/org/didcommx/DIDCommBenchPackSigned.kt rename to lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchPackSigned.kt diff --git a/lib/src/jmh/kotlin/org/didcommx/DIDCommBenchUnpack.kt b/lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchUnpack.kt similarity index 100% rename from lib/src/jmh/kotlin/org/didcommx/DIDCommBenchUnpack.kt rename to lib/src/jmh/kotlin/org/didcommx/didcomm/jmh/DIDCommBenchUnpack.kt diff --git a/lib/src/test/kotlin/org/didcommx/DIDCommBenchmarkJVMNaive.kt b/lib/src/test/kotlin/org/didcommx/didcomm/DIDCommBenchmarkJVMNaive.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/DIDCommBenchmarkJVMNaive.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/DIDCommBenchmarkJVMNaive.kt diff --git a/lib/src/test/kotlin/org/didcommx/DIDCommTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/DIDCommTest.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/DIDCommTest.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/DIDCommTest.kt diff --git a/lib/src/test/kotlin/org/didcommx/EncryptedMessageTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/EncryptedMessageTest.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/EncryptedMessageTest.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/EncryptedMessageTest.kt diff --git a/lib/src/test/kotlin/org/didcommx/PlaintextMessageTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/PlaintextMessageTest.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/PlaintextMessageTest.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/PlaintextMessageTest.kt diff --git a/lib/src/test/kotlin/org/didcommx/SignedMessageTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/SignedMessageTest.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/SignedMessageTest.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/SignedMessageTest.kt diff --git a/lib/src/test/kotlin/org/didcommx/crypto/key/RecipientKeySelectorTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/RecipientKeySelectorTest.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/crypto/key/RecipientKeySelectorTest.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/RecipientKeySelectorTest.kt diff --git a/lib/src/test/kotlin/org/didcommx/crypto/key/SenderKeySelectorTest.kt b/lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/SenderKeySelectorTest.kt similarity index 100% rename from lib/src/test/kotlin/org/didcommx/crypto/key/SenderKeySelectorTest.kt rename to lib/src/test/kotlin/org/didcommx/didcomm/crypto/key/SenderKeySelectorTest.kt diff --git a/lib/src/testCommon/kotlin/org/didcommx/fixtures/BenchCommon.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/BenchCommon.kt similarity index 100% rename from lib/src/testCommon/kotlin/org/didcommx/fixtures/BenchCommon.kt rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/BenchCommon.kt diff --git a/lib/src/testCommon/kotlin/org/didcommx/fixtures/Fixtures.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/Fixtures.kt similarity index 100% rename from lib/src/testCommon/kotlin/org/didcommx/fixtures/Fixtures.kt rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/fixtures/Fixtures.kt diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/AliceSecretResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/AliceSecretResolverMock.kt similarity index 100% rename from lib/src/testCommon/kotlin/org/didcommx/mock/AliceSecretResolverMock.kt rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/AliceSecretResolverMock.kt diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/BobSecretResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/BobSecretResolverMock.kt similarity index 100% rename from lib/src/testCommon/kotlin/org/didcommx/mock/BobSecretResolverMock.kt rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/BobSecretResolverMock.kt diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/CharlieSecretResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/CharlieSecretResolverMock.kt similarity index 100% rename from lib/src/testCommon/kotlin/org/didcommx/mock/CharlieSecretResolverMock.kt rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/CharlieSecretResolverMock.kt diff --git a/lib/src/testCommon/kotlin/org/didcommx/mock/DIDDocResolverMock.kt b/lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/DIDDocResolverMock.kt similarity index 100% rename from lib/src/testCommon/kotlin/org/didcommx/mock/DIDDocResolverMock.kt rename to lib/src/testCommon/kotlin/org/didcommx/didcomm/mock/DIDDocResolverMock.kt From 97af4f1f90c8ae0189c5adc6f912161145c7fe23 Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Sun, 3 Oct 2021 16:53:30 +0300 Subject: [PATCH 5/6] fixes groupId Signed-off-by: Andrey Kononykhin --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index e702268..34230c7 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -8,7 +8,7 @@ plugins { id 'signing' } -group = "org.didcommx" +group = "org.didcommx.didcomm" version = "${version}" project.ext.artifactId = rootProject.name archivesBaseName = project.artifactId From 400e0c7767ba774aa891ba929295256dbc5dddbf Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Sun, 3 Oct 2021 16:59:59 +0300 Subject: [PATCH 6/6] minor fixes Signed-off-by: Andrey Kononykhin --- lib/build.gradle | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index 34230c7..6bd25b2 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -56,13 +56,6 @@ jmh { includeTests = true } -// publishing - -java { - withJavadocJar() - withSourcesJar() -} - task group { doLast { println(project.group) @@ -81,6 +74,13 @@ task version { } } +// publishing + +java { + withJavadocJar() + withSourcesJar() +} + publishing { publications { maven(MavenPublication) { @@ -148,3 +148,4 @@ javadoc { options.addBooleanOption('html5', true) } } +