From d367330c739fb71bdbff74a8accae332720df283 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 12:35:40 +0200 Subject: [PATCH 1/9] gradle and API upgrade --- .github/workflows/android-sdk.yml | 1 + VCL/build.gradle | 12 ++++++++---- app/build.gradle | 8 ++++---- build.gradle | 4 ++-- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index 5a2e743d..6ab2f818 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - VL-7525-upgrade workflow_dispatch: inputs: environment: diff --git a/VCL/build.gradle b/VCL/build.gradle index d2c21581..c3546cdd 100644 --- a/VCL/build.gradle +++ b/VCL/build.gradle @@ -6,13 +6,13 @@ plugins { } android { - compileSdk 33 + compileSdk 34 // buildToolsVersion "30.0.3" namespace 'io.velocitycareerlabs' defaultConfig { minSdk 24 - targetSdk 33 + targetSdk 34 versionName "2.4.2" versionCode 137 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -63,6 +63,10 @@ android { unitTests.includeAndroidResources = true unitTests.returnDefaultValues = true } + + buildFeatures { + buildConfig true + } } java { @@ -216,7 +220,7 @@ repositories { */ dependencies { - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3' //noinspection GradleDependency @@ -235,7 +239,7 @@ dependencies { testImplementation "org.mockito:mockito-inline:5.2.0" // Required -- JSON framework testImplementation 'org.json:json:20240303' - // jsonassert + // json assert testImplementation 'org.skyscreamer:jsonassert:1.5.1' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/app/build.gradle b/app/build.gradle index f65c4e08..2368bbad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,13 +5,13 @@ plugins { } android { - compileSdk 33 + compileSdk 34 // buildToolsVersion "30.0.3" defaultConfig { applicationId "com.vcl.wallet" minSdk 24 - targetSdk 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -43,9 +43,9 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/build.gradle b/build.gradle index 07aca28b..ecb7ef25 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.7.21" + ext.kotlin_version = "1.9.20" // Set "rc" suffix for VCL SDK release candidate ext.rcSuffix = "rc" repositories { @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 0a934162..312d01a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,7 @@ android.enableJetifier=true kotlin.code.style=official #android.enableR8=true #android.enableD8=true -android.disableAutomaticComponentCreation=true \ No newline at end of file +#android.disableAutomaticComponentCreation=true +#android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 89f2c2d7..331b8762 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip From 65659ab372232ce7680621c5775062265abfe53b Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 13:03:33 +0200 Subject: [PATCH 2/9] Update android-sdk.yml --- .github/workflows/android-sdk.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index 6ab2f818..5a2e743d 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - VL-7525-upgrade workflow_dispatch: inputs: environment: From d8feba33dfaaefd308010a38c20c57c5d2055894 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 13:06:20 +0200 Subject: [PATCH 3/9] ci gradle v8.4 --- .github/workflows/android-sdk-tests.yml | 2 +- .github/workflows/android-sdk.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-sdk-tests.yml b/.github/workflows/android-sdk-tests.yml index b974785c..7bdc2ef6 100644 --- a/.github/workflows/android-sdk-tests.yml +++ b/.github/workflows/android-sdk-tests.yml @@ -8,7 +8,7 @@ on: env: PACKAGE_TYPE: "aar" - GRADLE_VERSION: "7.5" + GRADLE_VERSION: "8.4" JAVA_VERSION: "17" ARTIFACT_PATH: "VCL/build/outputs" ANDROID_NEXUS_SIGNING_KEY_ID: ${{ secrets.ANDROID_NEXUS_SIGNING_KEY_ID }} diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index 5a2e743d..3d6c2cd7 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -18,7 +18,7 @@ on: env: PACKAGE_TYPE: "aar" - GRADLE_VERSION: "7.5" + GRADLE_VERSION: "8.4" JAVA_VERSION: "17" ARTIFACT_PATH: "VCL/build/outputs" GLOBAL_ENV: ${{ github.event_name == 'push' && format('{0}', 'dev') || inputs.environment }} From 658e5ecd49429c80d31cde3a6f78ec7e035d215a Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 13:28:20 +0200 Subject: [PATCH 4/9] Update android-sdk.yml --- .github/workflows/android-sdk.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index 3d6c2cd7..a52e2460 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -34,6 +34,8 @@ jobs: with: distribution: temurin java-version: ${{ env.JAVA_VERSION }} + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew # Run test - name: Run Test run: ./gradlew test @@ -50,6 +52,8 @@ jobs: with: distribution: temurin java-version: ${{ env.JAVA_VERSION }} + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew # Gradle Assemble - name: Gradle Assemble run: ./gradlew assemble${{ env.RELEASE_TAG }} From 3333464cb8cd7e4fac594c8188286ca75ff01753 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 14:45:09 +0200 Subject: [PATCH 5/9] Update android-sdk.yml --- .github/workflows/android-sdk.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index a52e2460..3d6c2cd7 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -34,8 +34,6 @@ jobs: with: distribution: temurin java-version: ${{ env.JAVA_VERSION }} - - name: Grant execute permission for gradlew - run: chmod +x ./gradlew # Run test - name: Run Test run: ./gradlew test @@ -52,8 +50,6 @@ jobs: with: distribution: temurin java-version: ${{ env.JAVA_VERSION }} - - name: Grant execute permission for gradlew - run: chmod +x ./gradlew # Gradle Assemble - name: Gradle Assemble run: ./gradlew assemble${{ env.RELEASE_TAG }} From 2c318b68cc9ab49067845f90e103abace4204315 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 16:18:41 +0200 Subject: [PATCH 6/9] Update build.gradle --- VCL/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VCL/build.gradle b/VCL/build.gradle index c3546cdd..f80cc565 100644 --- a/VCL/build.gradle +++ b/VCL/build.gradle @@ -87,7 +87,7 @@ def getGroupId = { -> return 'io.velocitycareerlabs' } -tasks.register('androidSourcesJar', Jar) { +task androidSourcesJar(type: Jar) { archiveClassifier.set('sources') if (project.plugins.findPlugin("com.android.library")) { // For Android libraries From 2f8849064c09c18e1812c30e624dd56daf02282d Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 16:21:30 +0200 Subject: [PATCH 7/9] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ecb7ef25..b2e09347 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { plugins { // Automation plugin // https://github.com/gradle-nexus/publish-plugin - id "io.github.gradle-nexus.publish-plugin" version "1.1.0" + id "io.github.gradle-nexus.publish-plugin" version "1.3.0" } // Publishing scripts From 85be70fc819a7ca9f837e23d43be4adcc8f5b3b0 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 16:29:12 +0200 Subject: [PATCH 8/9] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b2e09347..80b1a94c 100644 --- a/build.gradle +++ b/build.gradle @@ -31,11 +31,11 @@ allprojects { google() mavenCentral() maven { - url "$buildDir/VCL" + url "${getLayout().getBuildDirectory()}/VCL" } } } task clean(type: Delete) { - delete rootProject.buildDir + delete rootProject.getLayout().getBuildDirectory() } From 40ef52acb80db580812b8ae1587955b3b00d05be Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Thu, 28 Mar 2024 17:20:39 +0200 Subject: [PATCH 9/9] Update build.gradle --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 80b1a94c..792b1c34 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,6 @@ plugins { // Publishing scripts apply from: "${rootDir}/publish-core.gradle" - allprojects { repositories { google()