From ceffd353cd9be392ab116ceaae4664745cc8754d Mon Sep 17 00:00:00 2001 From: Jason Sznol Date: Fri, 19 Sep 2025 17:13:15 -0400 Subject: [PATCH 1/5] Updated Gradle to 9.1.0 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 --- gradlew.bat | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e18..2e11132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e01..adff685 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell From a71984622924741fecb549f81c3e75957032007e Mon Sep 17 00:00:00 2001 From: Jason Sznol Date: Fri, 19 Sep 2025 17:19:43 -0400 Subject: [PATCH 2/5] Updated Android Gradle Plugin to 8.12.3 --- dynamicprice/nextgen/sdk/build.gradle.kts | 3 +-- gradle/libs.versions.toml | 2 +- sdk-extensions/android/admob/build.gradle.kts | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dynamicprice/nextgen/sdk/build.gradle.kts b/dynamicprice/nextgen/sdk/build.gradle.kts index f73d220..8e2249f 100644 --- a/dynamicprice/nextgen/sdk/build.gradle.kts +++ b/dynamicprice/nextgen/sdk/build.gradle.kts @@ -27,8 +27,7 @@ kotlin { compilations.configureEach { compileTaskProvider.configure { - // Casting works around a type issue with AGP 8.10.0 that is fixed in 8.12.0 - (compilerOptions as KotlinJvmCompilerOptions).jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_1_8 } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad09622..c5d6558 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ads-google = "24.6.0" ads-google-nextgen = "0.19.0-beta01" ads-nimbus = "2.33.2" -android = "8.11.2" +android = "8.12.3" android-jvm = "19" android-min = "26" android-sdk = "36" diff --git a/sdk-extensions/android/admob/build.gradle.kts b/sdk-extensions/android/admob/build.gradle.kts index 335352a..e8878af 100644 --- a/sdk-extensions/android/admob/build.gradle.kts +++ b/sdk-extensions/android/admob/build.gradle.kts @@ -25,8 +25,7 @@ kotlin { minSdk = 21 compilations.configureEach { compileTaskProvider.configure { - // Casting works around a type issue with AGP 8.10.0 that is fixed in 8.12.0 - (compilerOptions as KotlinJvmCompilerOptions).jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_1_8 } } From bf608a4f0a2107ba2bd03e0d5d1a35c203df31d5 Mon Sep 17 00:00:00 2001 From: Jason Sznol Date: Fri, 19 Sep 2025 17:20:16 -0400 Subject: [PATCH 3/5] Updated Compose Multiplatform 1.9.0, Androidx Lifecycle 2.9.4 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c5d6558..7e418de 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ android-sdk = "36" androidx-appcompat = "1.7.1" androidx-collection = "1.5.0" androidx-core = "1.17.0" -androidx-lifecycle = "2.9.3" +androidx-lifecycle = "2.9.4" androidx-navigation = "2.9.4" androidx-startup = "1.2.0" @@ -22,7 +22,7 @@ api-google-client = "2.8.1" compose = "1.9.1" compose-activity = "1.11.0" -compose-multiplatform = "1.9.0-rc02" +compose-multiplatform = "1.9.0" commons-beanutils = "1.11.0" commmons-lang3 = "3.18.0" From 91fb1e08be061875bbec0b0d54cbba1dd8cc560e Mon Sep 17 00:00:00 2001 From: Jason Sznol Date: Fri, 19 Sep 2025 17:35:09 -0400 Subject: [PATCH 4/5] Update gradle Actions build to use latest versions --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6f8e8d..9945f53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +env: + XCODE_VERSION: 26.0 + jobs: gradle: runs-on: macos-latest @@ -22,14 +25,14 @@ jobs: ORG_GRADLE_PROJECT_openrtbPassword: ${{ github.token }} steps: - name: Checkout sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Xcode - run: sudo xcode-select --switch /Applications/Xcode_16.4.app + run: sudo xcode-select --switch /Applications/Xcode_${{ env.XCODE_VERSION }}.app - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' - java-version: '24' + java-version: '25' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 with: @@ -50,7 +53,6 @@ jobs: env: IOS_TARGET: 18.5 SIMULATOR_NAME: iPhone 16 - XCODE_VERSION: 26.0 steps: - name: Checkout sources uses: actions/checkout@v5 From 4af98ff4f7827c11cc2ad8b443e33fb13c4462ae Mon Sep 17 00:00:00 2001 From: Jason Sznol Date: Fri, 19 Sep 2025 17:35:32 -0400 Subject: [PATCH 5/5] Updated README with latest Android Gradle Plugin alpha --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a24c80..c8b838f 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,11 @@ i.e. or passed via the command line. #### gradle.properties ```properties # Override the Android Gradle Plugin to a canary version -android.gradle=8.13.0-alpha03 +android.gradle=9.0.0-alpha05 # Override the bytecode used to build the project android.jvm=17 ``` #### CLI ```shell -./gradlew build -Dandroid.gradle=8.13.0-alpha03 -Dandroid.jvm=17 +./gradlew build -Dandroid.gradle=9.0.0-alpha05 -Dandroid.jvm=17 ```