Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JAV-323 Support company ID attributes #337

Merged
merged 9 commits into from
Aug 1, 2024
Merged

JAV-323 Support company ID attributes #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
84c55e7
Update concordium-base to 370856b
Radiokot Jul 22, 2024
fab3710
Add company ID attribute types
Radiokot Jul 22, 2024
c443968
Update Android build platform to 29
Radiokot Jul 22, 2024
41bc1e5
Update version 7.2.0-SNAPSHOT
Radiokot Jul 22, 2024
5d7dac1
Gitignore Idea folder
Radiokot Jul 23, 2024
94b8edf
Update concordium-base to 38cf687
Radiokot Jul 31, 2024
59ff0f3
Update the changelog
Radiokot Jul 31, 2024
3a2d617
Update the base version in examples
Radiokot Jul 31, 2024
705438a
Update the CI Android SDK version to 29
Radiokot Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
run: |
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
--sdk_root=$ANDROID_SDK_ROOT \
"platform-tools" "platforms;android-27" "build-tools;27.0.3"
"platform-tools" "platforms;android-29" "build-tools;29.0.2"
- name: Checkout
uses: actions/checkout@v2
with:
Expand All @@ -114,4 +114,4 @@ jobs:
- name: Initialize root project
run: mvn install -N
- name: Build android sdk
run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install
run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
run: |
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
--sdk_root=$ANDROID_SDK_ROOT \
"platform-tools" "platforms;android-27" "build-tools;27.0.3"
"platform-tools" "platforms;android-29" "build-tools;29.0.2"
# Setup rust
- name: Setup Rust
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
run: |
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
--sdk_root=$ANDROID_SDK_ROOT \
"platform-tools" "platforms;android-27" "build-tools;27.0.3"
"platform-tools" "platforms;android-29" "build-tools;29.0.2"
- name: Setup JDK 8
uses: actions/setup-java@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.iml
.flattened-pom.xml
pom.xml.versionsBackup
.idea/
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased
- Added `MessageSigningDigest` class to generate digests for message signing
- Added support for company identity attributes

## 7.1.0
- Removed unnecessary `amount` parameter from `InvokeInstanceRequest`.
Expand Down
4 changes: 2 additions & 2 deletions concordium-android-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.concordium.sdk</groupId>
<artifactId>concordium-sdk-base</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.2.0-SNAPSHOT</version>
</parent>

<artifactId>concordium-android-sdk</artifactId>
Expand Down Expand Up @@ -265,7 +265,7 @@
<debuggable>true</debuggable>
</manifest>
<sdk>
<platform>27</platform>
<platform>29</platform>
</sdk>
<nativeLibrariesDirectory>${project.basedir}/native</nativeLibrariesDirectory>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion concordium-base
Open in desktop
Submodule concordium-base updated 106 files
2 changes: 1 addition & 1 deletion concordium-sdk-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>com.concordium.sdk</groupId>
<artifactId>concordium-sdk</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion concordium-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.concordium.sdk</groupId>
<artifactId>concordium-sdk-base</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.2.0-SNAPSHOT</version>
</parent>

<groupId>com.concordium.sdk</groupId>
Expand Down
11 changes: 10 additions & 1 deletion ...-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@ public enum AttributeType {
@JsonProperty("taxIdNo")
TAX_ID_NO,
@JsonProperty("lei")
LEI;
LEI,
@JsonProperty("legalName")
LEGAL_NAME,
@JsonProperty("legalCountry")
LEGAL_COUNTRY,
@JsonProperty("businessNumber")
BUSINESS_NUMBER,
@JsonProperty("registrationAuth")
REGISTRATION_AUTH,
;

public static AttributeType fromJSON(String jsonStr) throws JsonMappingException, JsonProcessingException {
return JsonMapper.INSTANCE.readValue(String.format("\"%s\"", jsonStr), AttributeType.class);
Expand Down
4 changes: 2 additions & 2 deletions crypto-jni/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.concordium.sdk</groupId>
<artifactId>concordium-sdk-base</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<url>https://github.com/Concordium/concordium-java-sdk</url>
Expand Down
Loading