Skip to content

Commit e2bd60d

Browse files
authored
Merge pull request #410 from DevKor-github/codexd/issue-394-dependency-refresh
[codex] Refresh critical dependencies
2 parents 398ae2b + 4f7cb6c commit e2bd60d

32 files changed

Lines changed: 1301 additions & 1110 deletions

analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ linter:
2525
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
2626
# producing the lint.
2727
rules:
28+
unnecessary_underscores: false
2829
# avoid_print: false # Uncomment to disable the `avoid_print` rule
2930
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
3031

android/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ if (isReleaseTask) {
8585

8686
android {
8787
namespace = "club.devkor.ontime"
88-
compileSdk = flutter.compileSdkVersion
88+
compileSdk = 36
8989
ndkVersion = flutter.ndkVersion
9090

9191
compileOptions {
9292
coreLibraryDesugaringEnabled = true
93-
sourceCompatibility = JavaVersion.VERSION_1_8
94-
targetCompatibility = JavaVersion.VERSION_1_8
93+
sourceCompatibility = JavaVersion.VERSION_17
94+
targetCompatibility = JavaVersion.VERSION_17
9595
}
9696

9797
buildFeatures {
9898
buildConfig = true
9999
}
100100

101101
kotlinOptions {
102-
jvmTarget = JavaVersion.VERSION_1_8
102+
jvmTarget = "17"
103103
}
104104

105105
buildFeatures {
@@ -108,7 +108,7 @@ android {
108108

109109
defaultConfig {
110110
applicationId = "club.devkor.ontime"
111-
minSdk = flutter.minSdkVersion
111+
minSdk = 23
112112
targetSdk = flutter.targetSdkVersion
113113
versionCode = flutter.versionCode
114114
versionName = flutter.versionName

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
3-
android.enableJetifier=true
3+
android.enableJetifier=false

android/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.3.0" apply false
21+
id "com.android.application" version "8.6.0" apply false
2222
// START: FlutterFire Configuration
23-
id "com.google.gms.google-services" version "4.3.15" apply false
23+
id "com.google.gms.google-services" version "4.4.2" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
25+
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
2626
}
2727

2828
include ":app"

docs/Dependency-Refresh-394.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Dependency Refresh 394
2+
3+
This note documents the production-readiness dependency pass for GitHub issue
4+
#394. The upgrade targets the versions resolvable by the project toolchain at
5+
the time of the pass: Flutter 3.32.6 and Dart 3.8.1.
6+
7+
## Updated Scope
8+
9+
- Removed the direct dependency on the discontinued `js` package.
10+
- Upgraded the production-critical batch covering Firebase, Google Sign-In,
11+
GoRouter, local notifications, secure storage, AppAuth, Drift, Freezed,
12+
GetIt, generator dependencies, and resolver-required transitive packages.
13+
- Raised the app Dart SDK constraint to `^3.8.0` because the refreshed
14+
generator stack requires Dart 3.8.
15+
- Updated Android build configuration for Java 17, AGP 8.6.0, Kotlin 2.0.20,
16+
Google Services 4.4.2, and minimum SDK 23.
17+
- Raised iOS deployment targets to 15.0 because Firebase 12.12.0 declares an
18+
iOS 15.0 minimum, and aligned generated pod targets through the Podfile
19+
post-install hook.
20+
21+
## Verification
22+
23+
- `flutter pub get`
24+
- `dart run build_runner build --delete-conflicting-outputs`
25+
- `flutter analyze`
26+
- `flutter test`
27+
- `flutter build web --release`
28+
- `flutter build apk --debug`
29+
- `pod install`
30+
- `flutter build ios --debug --no-codesign`
31+
32+
## Deferred Packages
33+
34+
These packages were intentionally left below latest because the current task is
35+
a critical-batch refresh, not a maximal all-dependency migration:
36+
37+
- `flutter_local_notifications` remains on 20.1.0 instead of 21.x.
38+
- `flutter_appauth` remains on 11.0.0 instead of 12.x.
39+
- `go_router` remains on 17.0.0 instead of 17.2.x.
40+
- `google_sign_in_web` remains on 1.1.0 instead of 1.1.3.
41+
- `kakao_flutter_sdk` and related Kakao packages remain on the 1.10.x line
42+
instead of 2.x.
43+
- `sign_in_with_apple` remains on 7.0.1 instead of 8.x.
44+
- `sqlite3_flutter_libs` remains on 0.5.42 instead of 0.6.0+eol.
45+
- `json_annotation` remains on 4.9.0 because the resolver keeps it there.
46+
47+
## Follow-Up Smoke Areas
48+
49+
- Google sign-in on web and mobile.
50+
- Token storage read/write/delete.
51+
- Notification permission prompt and foreground FCM display.
52+
- Scheduled fallback alarm notification and notification-tap navigation.
53+
- Startup routing redirects.

ios/Podfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '13.0'
2+
platform :ios, '15.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -40,5 +40,8 @@ end
4040
post_install do |installer|
4141
installer.pods_project.targets.each do |target|
4242
flutter_additional_ios_build_settings(target)
43+
target.build_configurations.each do |config|
44+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
45+
end
4346
end
4447
end

0 commit comments

Comments
 (0)