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.

Sign up for GitHub

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

Jump to bottom

deps android: Upgrade Android Gradle Plugin #887

Merged
merged 5 commits into from
Aug 15, 2024
Merged

deps android: Upgrade Android Gradle Plugin #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b57968f
deps android: Upgrade Gradle to 8.9, the latest
rajveermalviya Aug 12, 2024
7f01573
deps android: Upgrade Kotlin to 2.0.10
rajveermalviya Aug 12, 2024
baed78b
android build: Enable core library desugaring, needed by flutter_loca…
rajveermalviya Aug 12, 2024
9b4f796
android build: Avoid specifying ndkVersion explicitly
rajveermalviya Aug 12, 2024
1bea14d
deps android: Upgrade Android Gradle Plugin to 8.5.2
rajveermalviya Aug 14, 2024
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
9 changes: 8 additions & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@ android {
namespace "com.zulip.flutter"

compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
Copy link
Member

@gnprice gnprice Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

android build: Avoid specifying ndkVersion explicitly

This commit message needs a bit more explanation, so that our future selves and/or successors reading this a couple of years from now when the question of the NDK version comes up again don't have to wonder what we were thinking or sleuth it out.

I'll write a version. → 2e59090


compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8

// The use of desugar_jdk_libs causes warning noise at build time:
// https://github.com/zulip/zulip-flutter/pull/887#issuecomment-2287653388
// https://issuetracker.google.com/issues/294273986
// TODO(#351): Try removing core-library desugaring once we've
// removed flutter_local_notifications.
coreLibraryDesugaringEnabled true
}

kotlinOptions {
Expand Down Expand Up @@ -97,4 +103,5 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
}
4 changes: 2 additions & 2 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ android.enableJetifier=true
# Defining them here makes them available both in
# settings.gradle and in the build.gradle files.

agpVersion=8.1.4
agpVersion=8.5.2

# Generally update this to the version found in recent releases
# of Android Studio, as listed in this table:
# https://kotlinlang.org/docs/releases.html#release-details
# A helpful discussion is at:
# https://stackoverflow.com/a/74425347
kotlinVersion=1.9.10
kotlinVersion=2.0.10
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the wrapper is the one from the new Gradle too.)
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down