From 7522a80d4fb928e8f4d277d4651419f1dded6ecc Mon Sep 17 00:00:00 2001 From: Hjort Date: Thu, 1 Feb 2024 17:06:08 +0100 Subject: [PATCH] Put info into parent pom --- .github/workflows/release.yml | 4 ++-- concordium-android-sdk/.gitignore | 3 ++- concordium-android-sdk/pom.xml | 27 ++------------------------- concordium-sdk/pom.xml | 2 +- pom.xml | 26 +++++++++++++++++++++++++- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 324f28233..26db8cf46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,7 +87,7 @@ jobs: name: windows-library path: crypto-jni\target\release\crypto_jni.dll - build-aar-library: + build-native-android: runs-on: ubuntu-22.04 steps: - name: Set Up Android tools @@ -114,7 +114,7 @@ jobs: path: ./concordium-android-sdk/native build-and-release-jar: - needs: [build-native-ubuntu, build-native-macos, build-native-windows, build-aar-library] + needs: [build-native-ubuntu, build-native-macos, build-native-windows, build-native-android] # Use fixed OS version because we install packages on the system. runs-on: ubuntu-22.04 environment: release diff --git a/concordium-android-sdk/.gitignore b/concordium-android-sdk/.gitignore index b1ab2ca6a..49ccf2faa 100644 --- a/concordium-android-sdk/.gitignore +++ b/concordium-android-sdk/.gitignore @@ -3,4 +3,5 @@ /target /native/* /delombok -.flattened-pom.xml \ No newline at end of file +.flattened-pom.xml + diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml index 9c0cdc8da..0216fb5af 100644 --- a/concordium-android-sdk/pom.xml +++ b/concordium-android-sdk/pom.xml @@ -17,32 +17,9 @@ UTF-8 UTF-8 - + concordium-android-sdk An SDK for interacting with the Concordium blockchain packaged for Android - https://github.com/Concordium/concordium-java-sdk - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - Concordium Software - support@concordium.software - Concordium Software - https://concordium.com - - - - - scm:git:git://github.com:Concordium/concordium-java-sdk.git - scm:git:ssh://github.com:Concordium/concordium-java-sdk.git - https://github.com/Concordium/concordium-java-sdk/tree/main - @@ -330,4 +307,4 @@ https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - \ No newline at end of file + diff --git a/concordium-sdk/pom.xml b/concordium-sdk/pom.xml index c2070c8ca..f3076bf81 100644 --- a/concordium-sdk/pom.xml +++ b/concordium-sdk/pom.xml @@ -14,7 +14,7 @@ concordium-sdk concordium-sdk - https://github.com/Concordium/concordium-java-sdk + An SDK for interacting with the Concordium blockchain UTF-8 diff --git a/pom.xml b/pom.xml index 9b1d6abe0..5c25881bd 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,33 @@ 6.0.2 pom + https://github.com/Concordium/concordium-java-sdk + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Concordium Software + support@concordium.software + Concordium Software + https://concordium.com + + + + + scm:git:git://github.com:Concordium/concordium-java-sdk.git + scm:git:ssh://github.com:Concordium/concordium-java-sdk.git + https://github.com/Concordium/concordium-java-sdk/tree/main + + concordium-sdk concordium-android-sdk concordium-sdk-examples - \ No newline at end of file +