Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
3 changes: 1 addition & 2 deletions dynamicprice/nextgen/sdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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"

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"

Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH="\\\"\\\""


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -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" )

Expand Down Expand Up @@ -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" \
"$@"

Expand Down
3 changes: 1 addition & 2 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions sdk-extensions/android/admob/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
Loading