Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix : #5405 Feature/replace deprecated bundle calls #5611

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
57 changes: 27 additions & 30 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ android {
testInstrumentationRunnerArguments clearPackageData: 'true'
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath true
}
}
vectorDrawables { useSupportLibrary true }
Expand All @@ -30,7 +29,6 @@ android {
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
useIR = true
freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
}
buildFeatures {
Expand Down Expand Up @@ -156,49 +154,48 @@ if (project.gradle.startParameter?.taskRequests?.args[0]?.remove("--list-shards"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
"androidx.compose.foundation:foundation:$compose_version",
"androidx.compose.foundation:foundation-layout:$compose_version",
"androidx.compose.material:material:$compose_version",
"androidx.compose.runtime:runtime:$compose_version",
"androidx.compose.runtime:runtime-livedata:$compose_version",
"androidx.compose.ui:ui:$compose_version",
"androidx.compose.ui:ui-tooling:$compose_version",
'androidx.constraintlayout:constraintlayout:1.1.3',
'androidx.core:core-ktx:1.0.2',
'androidx.legacy:legacy-support-v4:1.0.0',
'androidx.lifecycle:lifecycle-extensions:2.0.0',
'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha03',
'androidx.navigation:navigation-fragment:2.0.0',
'androidx.navigation:navigation-fragment-ktx:2.0.0',
'androidx.navigation:navigation-ui:2.0.0',
'androidx.navigation:navigation-ui-ktx:2.0.0',
'androidx.constraintlayout:constraintlayout:2.1.4',
'androidx.core:core-ktx:1.12.0',
'androidx.legacy:legacy-support-v4:2.2.0',
'androidx.lifecycle:lifecycle-extensions:2.6.2',
'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2',
'androidx.navigation:navigation-fragment:2.7.5',
'androidx.navigation:navigation-fragment-ktx:2.7.5',
'androidx.navigation:navigation-ui:2.7.5',
'androidx.navigation:navigation-ui-ktx:2.7.5',
"androidx.fragment:fragment:$fragment_version",
'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha03',
'androidx.multidex:multidex:2.0.1',
'androidx.recyclerview:recyclerview:1.0.0',
'androidx.work:work-runtime-ktx:2.4.0',
'com.github.bumptech.glide:glide:4.11.0',
'androidx.recyclerview:recyclerview:1.4.0',
'androidx.work:work-runtime-ktx:2.8.1',
'com.github.bumptech.glide:glide:4.16.0',
'com.google.android.flexbox:flexbox:3.0.0',
'com.google.android.material:material:1.3.0',
'com.google.android.material:material:1.9.0',
"com.google.android.material:compose-theme-adapter:$compose_version",
'com.google.dagger:dagger:2.41',
'com.google.firebase:firebase-analytics:17.5.0',
'com.google.firebase:firebase-analytics-ktx:17.5.0',
'com.google.dagger:dagger:2.44.2',
'com.google.firebase:firebase-analytics:21.2.0',
'com.google.firebase:firebase-analytics-ktx:21.2.0',
'com.google.firebase:firebase-appcheck:16.0.0',
'com.google.firebase:firebase-appcheck-debug:16.0.0',
'com.google.firebase:firebase-appcheck-playintegrity:16.0.0',
'com.google.firebase:firebase-core:17.5.0',
'com.google.firebase:firebase-crashlytics:17.0.0',
'com.google.firebase:firebase-firestore-ktx:24.2.1',
'com.google.firebase:firebase-auth-ktx:19.3.1',
'com.google.guava:guava:28.1-android',
'com.google.protobuf:protobuf-javalite:3.17.3',
'com.google.firebase:firebase-core:21.2.0',
'com.google.firebase:firebase-crashlytics:18.3.1',
'com.google.firebase:firebase-firestore-ktx:24.6.1',
'com.google.firebase:firebase-auth-ktx:21.1.0',
'com.google.guava:guava:32.1.2-jre',
'com.google.protobuf:protobuf-javalite:3.23.0',
'nl.dionsegijn:konfetti:1.2.5',
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4',
'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4',
'org.mockito:mockito-core:2.7.22',
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20",
'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3',
'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3',
'org.mockito:mockito-core:5.6.0',
'com.github.oppia:android-spotlight:cc23499d37dc8533a2876e45b5063e981a4583f4'
)
compileOnly(
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.8.22'
ext.fragment_version = '1.2.0-rc01'
ext.compose_version = '1.1.1'
repositories {
google()
gradlePluginPortal()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
classpath 'com.google.gms:google-services:4.3.3'
Expand Down
3 changes: 1 addition & 2 deletions data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ android {
multiDexEnabled true
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath true
}
}
}
Expand Down Expand Up @@ -62,7 +61,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
'com.google.dagger:dagger:2.41',
'com.google.guava:guava:28.1-android',
'com.google.protobuf:protobuf-javalite:3.17.3',
Expand Down
3 changes: 1 addition & 2 deletions domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ android {
versionName "1.0"
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath true
}
}
}
Expand Down Expand Up @@ -84,7 +83,7 @@ android.sourceSets.test.kotlin.exclude(filesToExclude)
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
'androidx.exifinterface:exifinterface:1.0.0-rc01',
'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
'androidx.lifecycle:lifecycle-extensions:2.0.0',
Expand Down
2 changes: 1 addition & 1 deletion 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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4 changes: 2 additions & 2 deletions scripts/assets/maven_dependencies.textproto
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ maven_dependency {
}
}
maven_dependency {
artifact_name: "androidx.appcompat:appcompat-resources:1.3.1"
artifact_version: "1.3.1"
artifact_name: "androidx.appcompat:appcompat-resources:1.6.0"
artifact_version: "1.6.0"
license {
license_name: "The Apache Software License, Version 2.0"
original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
Expand Down
4 changes: 2 additions & 2 deletions testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.annotation:annotation:1.1.0',
'androidx.appcompat:appcompat:1.1.0',
'androidx.appcompat:appcompat:1.6.0',
'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
'androidx.core:core-ktx:1.0.2',
'androidx.core:core-ktx:1.15.0',
"androidx.test:core:1.0.0",
'androidx.test.espresso:espresso-accessibility:3.1.0',
'androidx.test.espresso:espresso-core:3.2.0',
Expand Down
2 changes: 1 addition & 1 deletion third_party/versions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ https://github.com/oppia/oppia-android/wiki/Updating-Maven-Dependencies
MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
"androidx.activity:activity-compose": "1.4.0",
"androidx.annotation:annotation": "1.1.0",
"androidx.appcompat:appcompat": "1.3.1",
"androidx.appcompat:appcompat": "1.6.0",
"androidx.compose.compiler:compiler": "1.1.1",
"androidx.compose.foundation:foundation": "1.1.1",
"androidx.compose.foundation:foundation-layout": "1.1.1",
Expand Down
3 changes: 1 addition & 2 deletions utility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ android {
versionName "1.0"
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath true
}
}
}
Expand Down Expand Up @@ -78,7 +77,7 @@ android.sourceSets.test.kotlin.exclude(filesToExclude)
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
'androidx.work:work-runtime-ktx:2.4.0',
'com.github.oppia:androidsvg:5bc9c7553e94c3476e8ea32baea3c77567228fcd',
Expand Down
Loading