Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/copy-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ 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'
Expand Down
20 changes: 10 additions & 10 deletions DynamicCodeLoadingKotlin/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.1'
api 'com.google.dagger:dagger-android-support:2.57.1'

kapt 'com.google.dagger:dagger-compiler:2.16'
kapt 'com.google.dagger:dagger-compiler:2.57.1'

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'
}
6 changes: 3 additions & 3 deletions DynamicCodeLoadingKotlin/build.gradle
Original file line number Diff line number Diff line change
@@ -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.20'
repositories {
maven {
url "http://storage.googleapis.com/r8-releases/raw/master"
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-all.zip
2 changes: 1 addition & 1 deletion DynamicCodeLoadingKotlin/storage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.1'
}
10 changes: 5 additions & 5 deletions DynamicFeatureNavigation/DSL/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20"
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.navigation:navigation-dynamic-features-fragment:2.9.4'
}
4 changes: 2 additions & 2 deletions DynamicFeatureNavigation/DSL/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-bin.zip
6 changes: 3 additions & 3 deletions DynamicFeatureNavigation/XML/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.4")
api("androidx.appcompat:appcompat:1.7.1")
api("androidx.constraintlayout:constraintlayout:2.2.1")
}
4 changes: 2 additions & 2 deletions DynamicFeatureNavigation/XML/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.20")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-bin.zip
6 changes: 3 additions & 3 deletions DynamicFeatures/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
16 changes: 8 additions & 8 deletions DynamicFeatures/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20',
'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 = [
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion DynamicFeatures/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-all.zip
4 changes: 2 additions & 2 deletions InstantApps/aab-simple/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions InstantApps/aab-simple/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20'

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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.0.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions InstantApps/analytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.3'
}
}

Expand All @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-all.zip
4 changes: 2 additions & 2 deletions InstantApps/cookie-api/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions InstantApps/cookie-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20'
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
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-all.zip
2 changes: 1 addition & 1 deletion InstantApps/install-api/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions InstantApps/install-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20'
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
Expand All @@ -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"
}
2 changes: 1 addition & 1 deletion InstantApps/install-api/features/base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-all.zip
Loading
Loading