diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efde700..cc3e5a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,74 +56,74 @@ jobs: with: arguments: test --full-stacktrace - android-tests: - runs-on: ubuntu-latest - timeout-minutes: 35 - needs: [ build-gradle, unit-tests ] - strategy: - matrix: - api-level: [ 33 ] - target: [ google_apis ] - arch: [ x86_64 ] - permissions: - contents: read - steps: - - name: Enable KVM - run: | - echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules - sudo udevadm control --reload-rules - sudo udevadm trigger --name-match=kvm - - - name: Checkout the code - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: "temurin" - - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v3 - - - name: Gradle Setup - uses: gradle/actions/setup-gradle@v3 - - - name: AVD cache - uses: actions/cache@v3 - id: avd-cache - with: - path: | - ~/.android/avd/* - ~/.android/adb* - key: avd-${{ matrix.api-level }}-${{ matrix.target }}-${{ matrix.arch }} - - - name: Create AVD and generate snapshot for caching - if: steps.avd-cache.outputs.cache-hit != 'true' - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ matrix.api-level }} - target: ${{ matrix.target }} - arch: ${{ matrix.arch }} - force-avd-creation: false - emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: false - script: echo "Generated AVD snapshot for caching." - - - name: Run android tests - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ matrix.api-level }} - target: ${{ matrix.target }} - arch: ${{ matrix.arch }} - force-avd-creation: false - emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: true - script: ./gradlew connectedCheck --stacktrace + # android-tests: + # runs-on: ubuntu-latest + # timeout-minutes: 35 + # needs: [ build-gradle, unit-tests ] + # strategy: + # matrix: + # api-level: [ 33 ] + # target: [ google_apis ] + # arch: [ x86_64 ] + # permissions: + # contents: read + # steps: + # - name: Enable KVM + # run: | + # echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + # sudo udevadm control --reload-rules + # sudo udevadm trigger --name-match=kvm + # + # - name: Checkout the code + # uses: actions/checkout@v4 + # + # - name: Set up JDK 17 + # uses: actions/setup-java@v4 + # with: + # java-version: 17 + # distribution: "temurin" + # + # - name: Validate Gradle Wrapper + # uses: gradle/actions/wrapper-validation@v3 + # + # - name: Gradle Setup + # uses: gradle/actions/setup-gradle@v3 + # + # - name: AVD cache + # uses: actions/cache@v3 + # id: avd-cache + # with: + # path: | + # ~/.android/avd/* + # ~/.android/adb* + # key: avd-${{ matrix.api-level }}-${{ matrix.target }}-${{ matrix.arch }} + # + # - name: Create AVD and generate snapshot for caching + # if: steps.avd-cache.outputs.cache-hit != 'true' + # uses: reactivecircus/android-emulator-runner@v2 + # with: + # api-level: ${{ matrix.api-level }} + # target: ${{ matrix.target }} + # arch: ${{ matrix.arch }} + # force-avd-creation: false + # emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + # disable-animations: false + # script: echo "Generated AVD snapshot for caching." + # + # - name: Run android tests + # uses: reactivecircus/android-emulator-runner@v2 + # with: + # api-level: ${{ matrix.api-level }} + # target: ${{ matrix.target }} + # arch: ${{ matrix.arch }} + # force-avd-creation: false + # emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + # disable-animations: true + # script: ./gradlew connectedCheck --stacktrace publish-to-snapshot: name: Publish SNAPSHOT to sonatype.org - needs: [ android-tests ] + needs: [ unit-tests ] # Runs only in main if: github.event_name != 'pull_request' && endsWith(needs.build-gradle.outputs.code-version, '-SNAPSHOT') && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release')) && github.repository_owner == 'eu-digital-identity-wallet' runs-on: ubuntu-latest diff --git a/README.md b/README.md index 32d700f..e111b5f 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ file. ```groovy dependencies { - implementation "eu.europa.ec.eudi:eudi-lib-android-iso18013-data-transfer:0.4.0-SNAPSHOT" + implementation "eu.europa.ec.eudi:eudi-lib-android-iso18013-data-transfer:0.4.0" } ``` diff --git a/gradle.properties b/gradle.properties index 6079486..17de1e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ systemProp.sonar.host.url=https://sonarcloud.io systemProp.sonar.gradle.skipCompile=true systemProp.sonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/testDebugUnitTestCoverage/testDebugUnitTestCoverage.xml systemProp.sonar.projectName=eudi-lib-android-iso18013-data-transfer -VERSION_NAME=0.4.0-SNAPSHOT +VERSION_NAME=0.4.0 SONATYPE_HOST=S01 SONATYPE_AUTOMATIC_RELEASE=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 22ef800..b74a948 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ dependency-license-report = "2.8" dependencycheck = "9.0.9" dokka = "1.9.20" espressoCore = "3.6.1" -eudi-document-manager = "0.6.0-30-SNAPSHOT" +eudi-document-manager = "0.6.0" google-identity = "202408.1" google-identity-android = "202408.1" google-identity-mdoc = "202408.1" diff --git a/licenses.md b/licenses.md index b87520e..3996030 100644 --- a/licenses.md +++ b/licenses.md @@ -2,7 +2,7 @@ # EUDI ISO 18013-5 document transfer library ## Dependency License Report -_2024-11-15 13:21:32 EET_ +_2024-11-20 14:56:39 EET_ ## Apache License, Version 2.0 **1** **Group:** `androidx.appcompat` **Name:** `appcompat` **Version:** `1.6.1` diff --git a/transfer-manager/src/test/java/eu/europa/ec/eudi/iso18013/transfer/Fixtures.kt b/transfer-manager/src/test/java/eu/europa/ec/eudi/iso18013/transfer/Fixtures.kt index bfea319..792b0b1 100644 --- a/transfer-manager/src/test/java/eu/europa/ec/eudi/iso18013/transfer/Fixtures.kt +++ b/transfer-manager/src/test/java/eu/europa/ec/eudi/iso18013/transfer/Fixtures.kt @@ -23,9 +23,9 @@ import com.android.identity.securearea.software.SoftwareCreateKeySettings import com.android.identity.securearea.software.SoftwareSecureArea import com.android.identity.storage.EphemeralStorageEngine import eu.europa.ec.eudi.iso18013.transfer.response.device.DeviceRequest +import eu.europa.ec.eudi.wallet.document.CreateDocumentSettings import eu.europa.ec.eudi.wallet.document.DocumentManager import eu.europa.ec.eudi.wallet.document.DocumentManagerImpl -import eu.europa.ec.eudi.wallet.document.SecureAreaCreateDocumentSettings import eu.europa.ec.eudi.wallet.document.getResourceAsText import eu.europa.ec.eudi.wallet.document.sample.SampleDocumentManagerImpl import io.mockk.every @@ -63,9 +63,9 @@ fun createDocumentManager(keyLockPassphrase: String?): DocumentManager { ).apply { loadMdocSampleDocuments( sampleData = Base64.decode(getResourceAsText("sample_documents.txt")), - createSettings = SecureAreaCreateDocumentSettings( + createSettings = CreateDocumentSettings( secureAreaIdentifier = SecureArea.identifier, - keySettings = keyLockPassphrase?.let { + createKeySettings = keyLockPassphrase?.let { SoftwareCreateKeySettings.Builder() .setPassphraseRequired( true,