Skip to content

Commit

Permalink
chore(android): Updare Android build toolchain
Browse files Browse the repository at this point in the history
* Update target sdk and compile sdk to 35
* Update Android NDK to 27+
* Update gradle to 8.10 and agp to 8.5
* Update kotlin to 2.0.10
  • Loading branch information
realth000 committed Aug 30, 2024
1 parent adbd7e7 commit bec7fba
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 17 deletions.
8 changes: 5 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ if (keystorePropertiesFile.exists()) {


android {
compileSdkVersion 34
ndkVersion flutter.ndkVersion
namespace = "kzs.th000.tsdm_client"
compileSdkVersion 35
// ndkVersion flutter.ndkVersion
ndkVersion "27.0.12077973"

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -55,7 +57,7 @@ android {
// webview_flutter_android acquires minSdkVersion >= 19, restore this when no longer use it.
// minSdkVersion flutter.minSdkVersion
minSdkVersion 23
targetSdkVersion 34
targetSdkVersion 35
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="kzs.th000.tsdm_client">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
allprojects {
ext.kotlin_version = '1.8.0'
ext.kotlin_version = '2.0.10'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
4 changes: 2 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.4.2" apply false
id "org.jetbrains.kotlin.android" version "1.8.0" apply false
id "com.android.application" version "8.5.0" apply false
id "org.jetbrains.kotlin.android" version "2.0.10" apply false
}

include ":app"
11 changes: 6 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -524,12 +524,13 @@ packages:
source: hosted
version: "6.0.0"
flutter_inappwebview_android:
dependency: transitive
dependency: "direct overridden"
description:
name: flutter_inappwebview_android
sha256: d247f6ed417f1f8c364612fa05a2ecba7f775c8d0c044c1d3b9ee33a6515c421
url: "https://pub.dev"
source: hosted
path: flutter_inappwebview_android
ref: d89b1d32638b49dfc58c4b7c84153be0c269d057
resolved-ref: d89b1d32638b49dfc58c4b7c84153be0c269d057
url: "https://github.com/holzgeist/flutter_inappwebview"
source: git
version: "1.0.13"
flutter_inappwebview_internal_annotations:
dependency: transitive
Expand Down
10 changes: 7 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,13 @@ dev_dependencies:
slang_build_runner: ^3.31.0
very_good_analysis: ^6.0.0

# dependency_overrides:
# # Blocked by custom_lint 0.5.3 and flutter_test
# uuid: ^4.2.1
# https://github.com/pichillilorenzo/flutter_inappwebview/issues/2193#issuecomment-2208626280
dependency_overrides:
flutter_inappwebview_android:
git:
url: https://github.com/holzgeist/flutter_inappwebview
path: flutter_inappwebview_android
ref: d89b1d32638b49dfc58c4b7c84153be0c269d057

flutter:
uses-material-design: true
Expand Down

0 comments on commit bec7fba

Please sign in to comment.