diff --git a/.github/workflows/copy-branch.yml b/.github/workflows/copy-branch.yml index 32c2d94d..b017c294 100644 --- a/.github/workflows/copy-branch.yml +++ b/.github/workflows/copy-branch.yml @@ -20,7 +20,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it, # but specifies master branch (old default). - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 ref: master diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffc7b1eb..9eb549da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,16 +13,16 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set Up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' # See 'Supported distributions' for available options java-version: '17' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 - name: Setup Android SDK uses: android-actions/setup-android@v3 diff --git a/DynamicCodeLoadingKotlin/app/build.gradle b/DynamicCodeLoadingKotlin/app/build.gradle index f8ae54ea..a9604f7d 100644 --- a/DynamicCodeLoadingKotlin/app/build.gradle +++ b/DynamicCodeLoadingKotlin/app/build.gradle @@ -51,18 +51,18 @@ dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - api 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.core:core-ktx:1.0.1' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + api 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.core:core-ktx:1.17.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' - implementation "com.google.android.play:core:1.4.1" + implementation "com.google.android.play:core:1.10.3" - daggerApi 'com.google.dagger:dagger:2.16' - api 'com.google.dagger:dagger-android-support:2.16' + daggerApi 'com.google.dagger:dagger:2.57.2' + api 'com.google.dagger:dagger-android-support:2.57.2' - kapt 'com.google.dagger:dagger-compiler:2.16' + kapt 'com.google.dagger:dagger-compiler:2.57.2' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha04' - androidTestImplementation 'androidx.test:rules:1.2.0-alpha04' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' + androidTestImplementation 'androidx.test:rules:1.7.0' } diff --git a/DynamicCodeLoadingKotlin/build.gradle b/DynamicCodeLoadingKotlin/build.gradle index 780b1f41..2d856b0c 100644 --- a/DynamicCodeLoadingKotlin/build.gradle +++ b/DynamicCodeLoadingKotlin/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.32' + ext.kotlin_version = '2.2.21' repositories { maven { url "http://storage.googleapis.com/r8-releases/raw/master" @@ -11,8 +11,8 @@ buildscript { } dependencies { - classpath 'com.android.tools:r8:2.2.64' // Must be before the Gradle Plugin for Android. - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools:r8:8.11.18' // Must be before the Gradle Plugin for Android. + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/DynamicCodeLoadingKotlin/gradle/wrapper/gradle-wrapper.properties b/DynamicCodeLoadingKotlin/gradle/wrapper/gradle-wrapper.properties index 4ba3603f..6ad52bd4 100644 --- a/DynamicCodeLoadingKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/DynamicCodeLoadingKotlin/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-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/DynamicCodeLoadingKotlin/storage/build.gradle b/DynamicCodeLoadingKotlin/storage/build.gradle index a1c92d8c..20ddac42 100644 --- a/DynamicCodeLoadingKotlin/storage/build.gradle +++ b/DynamicCodeLoadingKotlin/storage/build.gradle @@ -44,5 +44,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') - kapt 'com.google.dagger:dagger-compiler:2.16' + kapt 'com.google.dagger:dagger-compiler:2.57.2' } diff --git a/DynamicFeatureNavigation/DSL/app/build.gradle b/DynamicFeatureNavigation/DSL/app/build.gradle index 90540685..0b1e9200 100644 --- a/DynamicFeatureNavigation/DSL/app/build.gradle +++ b/DynamicFeatureNavigation/DSL/app/build.gradle @@ -53,9 +53,9 @@ android { } dependencies { - api 'androidx.fragment:fragment:1.3.4-ktx' - api 'androidx.constraintlayout:constraintlayout:2.0.4' - api "org.jetbrains.kotlin:kotlin-stdlib:1.5.0" - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'androidx.navigation:navigation-dynamic-features-fragment:2.4.0-alpha01' + api 'androidx.fragment:fragment:1.8.9' + api 'androidx.constraintlayout:constraintlayout:2.2.1' + api "org.jetbrains.kotlin:kotlin-stdlib:2.2.21" + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.navigation:navigation-dynamic-features-fragment:2.9.5' } diff --git a/DynamicFeatureNavigation/DSL/build.gradle b/DynamicFeatureNavigation/DSL/build.gradle index fdad7a3b..cc002fb5 100644 --- a/DynamicFeatureNavigation/DSL/build.gradle +++ b/DynamicFeatureNavigation/DSL/build.gradle @@ -21,8 +21,8 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.0.0-beta02") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") + classpath("com.android.tools.build:gradle:8.13.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/DynamicFeatureNavigation/DSL/gradle/wrapper/gradle-wrapper.properties b/DynamicFeatureNavigation/DSL/gradle/wrapper/gradle-wrapper.properties index 43b6ea51..f9c2e9b8 100644 --- a/DynamicFeatureNavigation/DSL/gradle/wrapper/gradle-wrapper.properties +++ b/DynamicFeatureNavigation/DSL/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip diff --git a/DynamicFeatureNavigation/XML/app/build.gradle.kts b/DynamicFeatureNavigation/XML/app/build.gradle.kts index 43002dbb..bad81bd9 100644 --- a/DynamicFeatureNavigation/XML/app/build.gradle.kts +++ b/DynamicFeatureNavigation/XML/app/build.gradle.kts @@ -49,7 +49,7 @@ android { } dependencies { - api("androidx.navigation:navigation-dynamic-features-fragment:2.4.0-alpha01") - api("androidx.appcompat:appcompat:1.3.0") - api("androidx.constraintlayout:constraintlayout:2.0.4") + api("androidx.navigation:navigation-dynamic-features-fragment:2.9.5") + api("androidx.appcompat:appcompat:1.7.1") + api("androidx.constraintlayout:constraintlayout:2.2.1") } \ No newline at end of file diff --git a/DynamicFeatureNavigation/XML/build.gradle.kts b/DynamicFeatureNavigation/XML/build.gradle.kts index b0ffa684..d8b5bc4c 100644 --- a/DynamicFeatureNavigation/XML/build.gradle.kts +++ b/DynamicFeatureNavigation/XML/build.gradle.kts @@ -23,8 +23,8 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.0.0-beta02") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") + classpath("com.android.tools.build:gradle:8.13.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/DynamicFeatureNavigation/XML/gradle/wrapper/gradle-wrapper.properties b/DynamicFeatureNavigation/XML/gradle/wrapper/gradle-wrapper.properties index 75daea98..b96f1c6b 100644 --- a/DynamicFeatureNavigation/XML/gradle/wrapper/gradle-wrapper.properties +++ b/DynamicFeatureNavigation/XML/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.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip diff --git a/DynamicFeatureNavigation/gradle/wrapper/gradle-wrapper.properties b/DynamicFeatureNavigation/gradle/wrapper/gradle-wrapper.properties index 4a095d98..b5aa1eb7 100644 --- a/DynamicFeatureNavigation/gradle/wrapper/gradle-wrapper.properties +++ b/DynamicFeatureNavigation/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-6.3-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip diff --git a/DynamicFeatures/app/build.gradle b/DynamicFeatures/app/build.gradle index 3b7e815b..2de7415c 100644 --- a/DynamicFeatures/app/build.gradle +++ b/DynamicFeatures/app/build.gradle @@ -61,12 +61,12 @@ dependencies { // Libraries which can be re-used in other modules should use the `api` keyword. // This way they can be shared with dependent feature modules. - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.9.1' api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" api "androidx.appcompat:appcompat:${versions.appcompat}" - api 'androidx.constraintlayout:constraintlayout:2.0.0' - api 'com.google.android.material:material:1.0.0' + api 'androidx.constraintlayout:constraintlayout:2.2.1' + api 'com.google.android.material:material:1.13.0' api "com.google.android.play:core:${versions.playcore}" androidTestImplementation "androidx.test.espresso:espresso-contrib:${versions.espresso}" diff --git a/DynamicFeatures/build.gradle b/DynamicFeatures/build.gradle index 018e7954..1ca8e3e4 100644 --- a/DynamicFeatures/build.gradle +++ b/DynamicFeatures/build.gradle @@ -22,13 +22,13 @@ buildscript { 'compileSdk' : 28, 'minSdk' : 21, 'targetSdk' : 28, - 'kotlin' : '1.3.61', - 'playcore' : '1.8.3', - 'appcompat' : '1.1.0', - 'espresso' : '3.2.0', - 'extJunit' : '1.1.1', - 'testRules' : '1.2.0', - 'testRunner' : '1.2.0', + 'kotlin' : '2.2.21', + 'playcore' : '1.10.3', + 'appcompat' : '1.7.1', + 'espresso' : '3.7.0', + 'extJunit' : '1.3.0', + 'testRules' : '1.7.0', + 'testRunner' : '1.7.0', ] ext.names = [ @@ -41,7 +41,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0-beta04' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" // NOTE: Do not place your application dependencies here; they belong diff --git a/DynamicFeatures/gradle/wrapper/gradle-wrapper.properties b/DynamicFeatures/gradle/wrapper/gradle-wrapper.properties index 8a868b73..607411bc 100644 --- a/DynamicFeatures/gradle/wrapper/gradle-wrapper.properties +++ b/DynamicFeatures/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-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/aab-simple/app/build.gradle b/InstantApps/aab-simple/app/build.gradle index 32bb15f9..489f24cc 100644 --- a/InstantApps/aab-simple/app/build.gradle +++ b/InstantApps/aab-simple/app/build.gradle @@ -37,8 +37,8 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' } repositories { mavenCentral() diff --git a/InstantApps/aab-simple/build.gradle b/InstantApps/aab-simple/build.gradle index 9d137c9b..71b17c3b 100644 --- a/InstantApps/aab-simple/build.gradle +++ b/InstantApps/aab-simple/build.gradle @@ -18,14 +18,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.0' + ext.kotlin_version = '2.2.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/InstantApps/aab-simple/gradle/wrapper/gradle-wrapper.properties b/InstantApps/aab-simple/gradle/wrapper/gradle-wrapper.properties index 4e974715..9f7bd4c9 100644 --- a/InstantApps/aab-simple/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/aab-simple/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/InstantApps/analytics/build.gradle b/InstantApps/analytics/build.gradle index 72776437..62aa3023 100644 --- a/InstantApps/analytics/build.gradle +++ b/InstantApps/analytics/build.gradle @@ -22,8 +22,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.google.gms:google-services:4.4.4' } } @@ -39,11 +39,11 @@ ext { minSdk = 15 versionCode = 1 versionName = '1.0' - appCompat = '1.0.2' - firebaseVer = '11.6.0' + appCompat = '1.7.1' + firebaseVer = '21.1.1' instantAppsVer = '1.1.0' - espressoVersion = '3.1.0' - androidTestVersion = '1.1.0' - hamcrestVersion = "1.3" + espressoVersion = '3.7.0' + androidTestVersion = '1.7.0' + hamcrestVersion = "3.0" } diff --git a/InstantApps/analytics/gradle/wrapper/gradle-wrapper.properties b/InstantApps/analytics/gradle/wrapper/gradle-wrapper.properties index 6a58f65b..82305cbc 100644 --- a/InstantApps/analytics/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/analytics/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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/cookie-api/app/build.gradle b/InstantApps/cookie-api/app/build.gradle index 3cfa1cc1..54d65efd 100644 --- a/InstantApps/cookie-api/app/build.gradle +++ b/InstantApps/cookie-api/app/build.gradle @@ -58,10 +58,10 @@ android { } dependencies { - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.appcompat:appcompat:$appCompat" - playServicesApi 'com.google.android.gms:play-services-instantapps:16.0.1' + playServicesApi 'com.google.android.gms:play-services-instantapps:18.2.0' androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" diff --git a/InstantApps/cookie-api/build.gradle b/InstantApps/cookie-api/build.gradle index 65753b57..6953a3d9 100644 --- a/InstantApps/cookie-api/build.gradle +++ b/InstantApps/cookie-api/build.gradle @@ -16,14 +16,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.10' + ext.kotlin_version = '2.2.21' repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -43,9 +43,9 @@ ext { minSdk = 15 versionCode = 1 versionName = "1.0" - appCompat = '1.0.2' + appCompat = '1.7.1' - espressoVersion = '3.1.0' - androidTestVersion = '1.1.0' - hamcrestVersion = "1.3" + espressoVersion = '3.7.0' + androidTestVersion = '1.7.0' + hamcrestVersion = "3.0" } diff --git a/InstantApps/cookie-api/gradle/wrapper/gradle-wrapper.properties b/InstantApps/cookie-api/gradle/wrapper/gradle-wrapper.properties index fa22e48b..d2aff769 100644 --- a/InstantApps/cookie-api/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/cookie-api/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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/install-api/app/build.gradle b/InstantApps/install-api/app/build.gradle index a96f1f14..46b73491 100644 --- a/InstantApps/install-api/app/build.gradle +++ b/InstantApps/install-api/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.google.android.gms:play-services-instantapps:16.0.1' + implementation 'com.google.android.gms:play-services-instantapps:18.2.0' implementation "androidx.appcompat:appcompat:$appCompat" implementation "androidx.constraintlayout:constraintlayout:$constraintlayout" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/InstantApps/install-api/build.gradle b/InstantApps/install-api/build.gradle index 3377adb4..03546bf6 100644 --- a/InstantApps/install-api/build.gradle +++ b/InstantApps/install-api/build.gradle @@ -16,14 +16,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.10' + ext.kotlin_version = '2.2.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -43,9 +43,9 @@ ext { minSdk = 15 versionCode = 1 versionName = "1.0" - appCompat = "1.0.2" - constraintlayout = "1.1.3" - espressoVersion = '3.1.0' - androidTestVersion = '1.1.0' - hamcrestVersion = "1.3" + appCompat = "1.7.1" + constraintlayout = "2.2.1" + espressoVersion = '3.7.0' + androidTestVersion = '1.7.0' + hamcrestVersion = "3.0" } diff --git a/InstantApps/install-api/features/base/build.gradle b/InstantApps/install-api/features/base/build.gradle index 5b8e453b..46f50966 100644 --- a/InstantApps/install-api/features/base/build.gradle +++ b/InstantApps/install-api/features/base/build.gradle @@ -46,6 +46,6 @@ dependencies { application project(":installed") feature project(':features:install') api "androidx.appcompat:appcompat:$appCompat" - api 'com.google.android.gms:play-services-instantapps:16.0.0' + api 'com.google.android.gms:play-services-instantapps:18.2.0' } diff --git a/InstantApps/install-api/gradle/wrapper/gradle-wrapper.properties b/InstantApps/install-api/gradle/wrapper/gradle-wrapper.properties index fa22e48b..d2aff769 100644 --- a/InstantApps/install-api/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/install-api/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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/multi-feature-module/build.gradle b/InstantApps/multi-feature-module/build.gradle index 1a2ddc0f..07946270 100644 --- a/InstantApps/multi-feature-module/build.gradle +++ b/InstantApps/multi-feature-module/build.gradle @@ -22,14 +22,14 @@ ext { minSdk = 21 versionCode = 1 versionName = "1.0" - appCompat = '1.0.2' - recyclerView = '1.0.0' - glide = "3.7.0" + appCompat = '1.7.1' + recyclerView = '1.4.0' + glide = "5.0.5" retrofit = "1.9.0" - espressoVersion = '3.1.0' - androidTestVersion = '1.1.0' - hamcrestVersion = "1.3" + espressoVersion = '3.7.0' + androidTestVersion = '1.7.0' + hamcrestVersion = "3.0" } buildscript { @@ -38,7 +38,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' } } allprojects { diff --git a/InstantApps/multi-feature-module/gradle/wrapper/gradle-wrapper.properties b/InstantApps/multi-feature-module/gradle/wrapper/gradle-wrapper.properties index c1107218..bca61621 100644 --- a/InstantApps/multi-feature-module/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/multi-feature-module/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-4.10.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/service/build.gradle b/InstantApps/service/build.gradle index a80d9bac..5a6ec20d 100644 --- a/InstantApps/service/build.gradle +++ b/InstantApps/service/build.gradle @@ -22,7 +22,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' } } @@ -38,10 +38,10 @@ ext { minSdk = 23 versionCode = 1 versionName = '1.0' - appCompat = '1.0.2' - constraintLayout = '1.1.3' + appCompat = '1.7.1' + constraintLayout = '2.2.1' - espressoVersion = '3.1.0' - androidTestVersion = '1.1.0' - hamcrestVersion = "1.3" + espressoVersion = '3.7.0' + androidTestVersion = '1.7.0' + hamcrestVersion = "3.0" } diff --git a/InstantApps/service/gradle/wrapper/gradle-wrapper.properties b/InstantApps/service/gradle/wrapper/gradle-wrapper.properties index ec2ee4c3..f5d79f8e 100644 --- a/InstantApps/service/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/service/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/storage-api/app/build.gradle b/InstantApps/storage-api/app/build.gradle index 8e858d38..0f814825 100644 --- a/InstantApps/storage-api/app/build.gradle +++ b/InstantApps/storage-api/app/build.gradle @@ -44,7 +44,7 @@ android { dependencies { implementation "com.android.support:appcompat-v7:$appCompat" implementation "androidx.constraintlayout:constraintlayout:$constraintLayout" - implementation 'com.google.android.gms:play-services-instantapps:16.0.1' + implementation 'com.google.android.gms:play-services-instantapps:18.2.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" diff --git a/InstantApps/storage-api/build.gradle b/InstantApps/storage-api/build.gradle index 150ae0ae..43a7ab45 100644 --- a/InstantApps/storage-api/build.gradle +++ b/InstantApps/storage-api/build.gradle @@ -16,14 +16,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.10' + ext.kotlin_version = '2.2.21' repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -43,10 +43,10 @@ ext { minSdk = 15 versionCode = 1 versionName = "1.0" - appCompat = '1.0.2' - constraintLayout = '1.1.3' + appCompat = '28.0.0' + constraintLayout = '2.2.1' - espressoVersion = '3.1.0' - androidTestVersion = '1.1.0' - hamcrestVersion = "1.3" + espressoVersion = '3.7.0' + androidTestVersion = '1.7.0' + hamcrestVersion = "3.0" } diff --git a/InstantApps/storage-api/gradle/wrapper/gradle-wrapper.properties b/InstantApps/storage-api/gradle/wrapper/gradle-wrapper.properties index 99072348..50e0712c 100644 --- a/InstantApps/storage-api/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/storage-api/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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/InstantApps/urlless/app/build.gradle b/InstantApps/urlless/app/build.gradle index 6d7a3b4f..45c1b0d7 100644 --- a/InstantApps/urlless/app/build.gradle +++ b/InstantApps/urlless/app/build.gradle @@ -41,6 +41,6 @@ android { } dependencies { - api 'androidx.appcompat:appcompat:1.0.2' - api 'androidx.constraintlayout:constraintlayout:1.1.3' + api 'androidx.appcompat:appcompat:1.7.1' + api 'androidx.constraintlayout:constraintlayout:2.2.1' } diff --git a/InstantApps/urlless/build.gradle b/InstantApps/urlless/build.gradle index a1057c9c..4a6b6e42 100644 --- a/InstantApps/urlless/build.gradle +++ b/InstantApps/urlless/build.gradle @@ -23,7 +23,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:8.13.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/InstantApps/urlless/feature/build.gradle b/InstantApps/urlless/feature/build.gradle index af32da88..42ca4eed 100644 --- a/InstantApps/urlless/feature/build.gradle +++ b/InstantApps/urlless/feature/build.gradle @@ -30,5 +30,5 @@ android { dependencies { implementation project(':app') implementation project(':greet') - implementation 'com.google.android.play:core:1.2.0' + implementation 'com.google.android.play:core:1.10.3' } diff --git a/InstantApps/urlless/gradle/wrapper/gradle-wrapper.properties b/InstantApps/urlless/gradle/wrapper/gradle-wrapper.properties index 5c1b6c95..63e0e830 100644 --- a/InstantApps/urlless/gradle/wrapper/gradle-wrapper.properties +++ b/InstantApps/urlless/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/PlayAssetDelivery/NativeSample/Teapot/build.gradle b/PlayAssetDelivery/NativeSample/Teapot/build.gradle index 0baeafe8..1f4bbc46 100644 --- a/PlayAssetDelivery/NativeSample/Teapot/build.gradle +++ b/PlayAssetDelivery/NativeSample/Teapot/build.gradle @@ -64,7 +64,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation files("$PLAY_CORE_NATIVE_SDK_DIR/playcore.aar") } diff --git a/PlayAssetDelivery/NativeSample/Teapot/gradle/wrapper/gradle-wrapper.properties b/PlayAssetDelivery/NativeSample/Teapot/gradle/wrapper/gradle-wrapper.properties index 77619ee6..f29f7a40 100644 --- a/PlayAssetDelivery/NativeSample/Teapot/gradle/wrapper/gradle-wrapper.properties +++ b/PlayAssetDelivery/NativeSample/Teapot/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-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip diff --git a/PlayAssetDelivery/NativeSample/build.gradle b/PlayAssetDelivery/NativeSample/build.gradle index 2e7a223a..d61f0982 100755 --- a/PlayAssetDelivery/NativeSample/build.gradle +++ b/PlayAssetDelivery/NativeSample/build.gradle @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0-beta03' + classpath 'com.android.tools.build:gradle:8.13.0' } } diff --git a/PlayAssetDelivery/NativeSample/gradle/wrapper/gradle-wrapper.properties b/PlayAssetDelivery/NativeSample/gradle/wrapper/gradle-wrapper.properties index a2bf1313..63e0e830 100644 --- a/PlayAssetDelivery/NativeSample/gradle/wrapper/gradle-wrapper.properties +++ b/PlayAssetDelivery/NativeSample/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/PlayCoreKtx/app/build.gradle b/PlayCoreKtx/app/build.gradle index 2aa6439e..28dfbb95 100644 --- a/PlayCoreKtx/app/build.gradle +++ b/PlayCoreKtx/app/build.gradle @@ -102,7 +102,7 @@ configurations { } dependencies { - ktlint "com.pinterest:ktlint:0.36.0" + ktlint "com.pinterest:ktlint:0.51.0-FINAL" } task ktlint(type: JavaExec, group: "cleanup") { diff --git a/PlayCoreKtx/build.gradle b/PlayCoreKtx/build.gradle index 1ff7a748..057c340f 100644 --- a/PlayCoreKtx/build.gradle +++ b/PlayCoreKtx/build.gradle @@ -20,18 +20,18 @@ buildscript { 'compileSdk' : 30, 'minSdk' : 24, 'targetSdk' : 30, - 'activity' : '1.2.0-alpha08', + 'activity' : '1.11.0', 'annotations' : '1.1.0', - 'appcompat' : '1.3.0-alpha02', - 'constraintLayout' : '2.0.1', - 'coroutines' : '1.3.9', + 'appcompat' : '1.7.1', + 'constraintLayout' : '2.2.1', + 'coroutines' : '1.10.2', 'espresso' : '3.1.1', 'extJunit' : '1.1.0', - 'fragment' : '1.3.0-alpha08', - 'kotlin' : '1.4.21', - 'lifecycle' : '2.3.0-alpha07', - 'material' : '1.2.0', - 'playcore' : '1.8.0', + 'fragment' : '1.8.9', + 'kotlin' : '2.2.21', + 'lifecycle' : '2.9.4', + 'material' : '1.13.0', + 'playcore' : '1.10.3', 'playcoreKtx' : '1.8.1', 'testRules' : '1.1.1', 'testRunner' : '1.1.1', @@ -53,9 +53,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" - classpath("com.github.triplet.gradle:play-publisher:3.1.0") + classpath("com.github.triplet.gradle:play-publisher:3.12.1") } } diff --git a/PlayCoreKtx/buildSrc/build.gradle.kts b/PlayCoreKtx/buildSrc/build.gradle.kts index b9bf243e..8827400f 100644 --- a/PlayCoreKtx/buildSrc/build.gradle.kts +++ b/PlayCoreKtx/buildSrc/build.gradle.kts @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile * limitations under the License. */ plugins { - kotlin("jvm") version "1.3.72" + kotlin("jvm") version "2.2.21" id("java-gradle-plugin") } @@ -26,8 +26,8 @@ repositories { } dependencies { - implementation("com.android.tools.build:gradle-api:4.1.1") - implementation("com.android.tools.build:gradle:4.1.1") + implementation("com.android.tools.build:gradle-api:8.13.0") + implementation("com.android.tools.build:gradle:8.13.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/PlayCoreKtx/gradle/wrapper/gradle-wrapper.properties b/PlayCoreKtx/gradle/wrapper/gradle-wrapper.properties index 5a491c54..3325301b 100644 --- a/PlayCoreKtx/gradle/wrapper/gradle-wrapper.properties +++ b/PlayCoreKtx/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-9.2.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists