Skip to content

Commit 4a8038d

Browse files
rileychhrileychh
committed
Release/v1.6.9 (#256)
Release: 1.6.9 Also updated to AGP 8 and target Android SDK 35.
1 parent 0b84adc commit 4a8038d

13 files changed

Lines changed: 96 additions & 59 deletions

File tree

‎android/app/build.gradle‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,32 @@ if (keystorePropertiesFile.exists()) {
3636

3737
android {
3838
namespace = "club.ntut.npc.tat"
39-
compileSdkVersion 34
40-
ndkVersion "25.1.8937393"
39+
compileSdk 35
40+
ndkVersion = "25.1.8937393"
41+
42+
compileOptions {
43+
sourceCompatibility JavaVersion.VERSION_11
44+
targetCompatibility JavaVersion.VERSION_11
45+
}
46+
47+
kotlinOptions {
48+
jvmTarget = '11'
49+
}
4150

4251
sourceSets {
4352
main.java.srcDirs += 'src/main/kotlin'
4453
}
4554

46-
lintOptions {
55+
lint {
4756
disable 'InvalidPackage'
4857
checkReleaseBuilds false
4958
abortOnError false
5059
}
5160

5261
defaultConfig {
5362
applicationId "club.ntut.npc.tat"
54-
minSdkVersion 24
55-
targetSdkVersion 34
63+
minSdk 24
64+
targetSdk 35
5665
versionCode flutterVersionCode.toInteger()
5766
versionName flutterVersionName
5867
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -85,7 +94,7 @@ android {
8594
}
8695
}
8796

88-
flavorDimensions "default"
97+
flavorDimensions = ["default"]
8998
productFlavors {
9099
beta {
91100
dimension "default"

‎android/build.gradle‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
9+
classpath 'com.android.tools.build:gradle:8.1.4'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
classpath 'com.google.gms:google-services:4.4.0'
1212
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
@@ -28,6 +28,38 @@ subprojects {
2828
project.evaluationDependsOn(':app')
2929
}
3030

31+
// AGP 8.x workarounds for plugins
32+
subprojects { subproject ->
33+
subproject.plugins.withId('com.android.library') {
34+
subproject.android {
35+
compileSdk 35
36+
37+
if (namespace == null || namespace.isEmpty()) {
38+
def manifest = subproject.file("src/main/AndroidManifest.xml")
39+
if (manifest.exists()) {
40+
def xml = new groovy.xml.XmlSlurper().parse(manifest)
41+
namespace = xml.@package.toString()
42+
}
43+
}
44+
}
45+
46+
// Force Java 11 after plugin evaluation
47+
subproject.afterEvaluate {
48+
subproject.android {
49+
compileOptions {
50+
sourceCompatibility JavaVersion.VERSION_11
51+
targetCompatibility JavaVersion.VERSION_11
52+
}
53+
}
54+
}
55+
}
56+
subproject.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
57+
kotlinOptions {
58+
jvmTarget = "11"
59+
}
60+
}
61+
}
62+
3163
tasks.register("clean", Delete) {
3264
delete rootProject.buildDir
3365
}

‎android/gradle.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ android.enableR8=true
33
android.useAndroidX=true
44
android.enableJetifier=true
55

6-
# Reason: Recently, the Flutter team has received several reports from developers indicating they are experiencing app crashes on certain devices on Android 6.0.
7-
# android.bundle.enableUncompressedNativeLibs=false
6+
# AGP 8.x compatibility
7+
android.defaults.buildfeatures.buildconfig=true
8+
android.nonTransitiveRClass=false
9+
android.nonFinalResIds=false

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

‎lib/src/task/dialog_task.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ignore_for_file: import_of_legacy_library_into_null_safe
2-
31
import 'package:awesome_dialog/awesome_dialog.dart';
4-
import 'package:connectivity/connectivity.dart';
2+
import 'package:connectivity_plus/connectivity_plus.dart';
53
import 'package:flutter_app/src/r.dart';
64
import 'package:flutter_app/ui/other/msg_dialog.dart';
75
import 'package:flutter_app/ui/other/my_progress_dialog.dart';
@@ -39,7 +37,7 @@ class DialogTask<T> extends Task<T> {
3937
}
4038

4139
Future<TaskStatus> onErrorParameter(MsgDialogParameter parameter) async {
42-
final connectivityResult = await (Connectivity().checkConnectivity());
40+
final connectivityResult = await Connectivity().checkConnectivity();
4341
if (connectivityResult == ConnectivityResult.none) {
4442
parameter = MsgDialogParameter(
4543
desc: R.current.networkError,

‎lib/src/task/task_flow.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// ignore_for_file: import_of_legacy_library_into_null_safe
2-
3-
import 'package:connectivity/connectivity.dart';
1+
import 'package:connectivity_plus/connectivity_plus.dart';
42
import 'package:flutter_app/debug/log/log.dart';
53
import 'package:flutter_app/src/r.dart';
64
import 'package:flutter_app/src/task/course/course_system_task.dart';
@@ -41,7 +39,7 @@ class TaskFlow {
4139
}
4240

4341
Future<bool> start() async {
44-
var connectivityResult = await (Connectivity().checkConnectivity());
42+
final connectivityResult = await Connectivity().checkConnectivity();
4543
if (connectivityResult == ConnectivityResult.none) {
4644
MyToast.show(R.current.pleaseConnectToNetwork);
4745
return false;

‎lib/src/util/mx_player_util.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// @dart=2.10
33
import 'dart:io';
44

5-
import 'package:android_intent/android_intent.dart';
5+
import 'package:android_intent_plus/android_intent.dart';
66
import 'package:flutter_app/src/r.dart';
77
import 'package:flutter_app/ui/other/my_toast.dart';
88
import 'package:flutter_app/ui/other/route_utils.dart';

‎lib/src/version/update/app_update.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:flutter_app/src/r.dart';
99
import 'package:flutter_app/src/util/remote_config_util.dart';
1010
import 'package:flutter_app/ui/other/my_toast.dart';
1111
import 'package:get/get.dart';
12-
import 'package:package_info/package_info.dart';
12+
import 'package:package_info_plus/package_info_plus.dart';
1313
import 'package:sprintf/sprintf.dart';
1414
import 'package:url_launcher/url_launcher.dart';
1515
import 'package:version/version.dart';

‎lib/ui/pages/other/page/setting_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import 'dart:io';
44

5-
import 'package:connectivity/connectivity.dart';
5+
import 'package:connectivity_plus/connectivity_plus.dart';
66
import 'package:flutter/material.dart';
77
import 'package:flutter_app/src/config/app_config.dart';
88
import 'package:flutter_app/src/config/app_themes.dart';

‎pubspec.lock‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ packages:
3333
url: "https://pub.dev"
3434
source: hosted
3535
version: "5.13.0"
36-
android_intent:
36+
android_intent_plus:
3737
dependency: "direct main"
3838
description:
39-
name: android_intent
40-
sha256: "498b451c6be831de2fe032290a8699d2a185c9c6de3bbe6d90db1623a9f62321"
39+
name: android_intent_plus
40+
sha256: "53136214d506d3128c9f4e5bfce3d026abe7e8038958629811a8d3223b1757c1"
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "2.0.2"
43+
version: "5.2.1"
4444
archive:
4545
dependency: transitive
4646
description:
@@ -281,38 +281,22 @@ packages:
281281
url: "https://pub.dev"
282282
source: hosted
283283
version: "1.17.0"
284-
connectivity:
284+
connectivity_plus:
285285
dependency: "direct main"
286286
description:
287-
name: connectivity
288-
sha256: a8e91263cf3e25fb5cc95e19dfde4999e32a648ac3b9e8a558a28165731678f8
289-
url: "https://pub.dev"
290-
source: hosted
291-
version: "3.0.6"
292-
connectivity_for_web:
293-
dependency: transitive
294-
description:
295-
name: connectivity_for_web
296-
sha256: "01a390c1d5adc2ed1fa1f52d120c07fe9fd01166a93f965a832fd6cfc0ea6482"
287+
name: connectivity_plus
288+
sha256: "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0"
297289
url: "https://pub.dev"
298290
source: hosted
299-
version: "0.4.0+1"
300-
connectivity_macos:
291+
version: "5.0.2"
292+
connectivity_plus_platform_interface:
301293
dependency: transitive
302294
description:
303-
name: connectivity_macos
304-
sha256: "51ae08d5162eca9669b9d8951ed83ce19c5355a81149f94e4dee2740beb93628"
295+
name: connectivity_plus_platform_interface
296+
sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
305297
url: "https://pub.dev"
306298
source: hosted
307-
version: "0.2.1+2"
308-
connectivity_platform_interface:
309-
dependency: transitive
310-
description:
311-
name: connectivity_platform_interface
312-
sha256: "2d82e942df9d49f29a24bb07fb5ce085d4a53e47818c62364d2b6deb9e0d7a8e"
313-
url: "https://pub.dev"
314-
source: hosted
315-
version: "2.0.1"
299+
version: "1.2.4"
316300
convert:
317301
dependency: transitive
318302
description:
@@ -1071,6 +1055,14 @@ packages:
10711055
url: "https://pub.dev"
10721056
source: hosted
10731057
version: "1.0.0"
1058+
nm:
1059+
dependency: transitive
1060+
description:
1061+
name: nm
1062+
sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
1063+
url: "https://pub.dev"
1064+
source: hosted
1065+
version: "0.5.0"
10741066
numberpicker:
10751067
dependency: "direct main"
10761068
description:
@@ -1103,14 +1095,22 @@ packages:
11031095
url: "https://pub.dev"
11041096
source: hosted
11051097
version: "2.1.0"
1106-
package_info:
1098+
package_info_plus:
11071099
dependency: "direct main"
11081100
description:
1109-
name: package_info
1110-
sha256: "6c07d9d82c69e16afeeeeb6866fe43985a20b3b50df243091bfc4a4ad2b03b75"
1101+
name: package_info_plus
1102+
sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745"
11111103
url: "https://pub.dev"
11121104
source: hosted
1113-
version: "2.0.2"
1105+
version: "3.1.2"
1106+
package_info_plus_platform_interface:
1107+
dependency: transitive
1108+
description:
1109+
name: package_info_plus_platform_interface
1110+
sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
1111+
url: "https://pub.dev"
1112+
source: hosted
1113+
version: "2.0.1"
11141114
path:
11151115
dependency: "direct main"
11161116
description:

0 commit comments

Comments
 (0)