Skip to content

Commit 0ac09ed

Browse files
upgrade to flutter 3.24
1 parent bc268ba commit 0ac09ed

File tree

11 files changed

+221
-197
lines changed

11 files changed

+221
-197
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ jobs:
1616
- uses: actions/setup-java@v2
1717
with:
1818
distribution: 'zulu'
19-
java-version: '11'
19+
java-version: '17'
2020
- uses: subosito/flutter-action@v2
2121
with:
22-
flutter-version: '3.22.0'
22+
flutter-version: '3.24.0'
23+
- name: Clean Gradle cache
24+
run: rm -rf ~/.gradle/caches/
25+
- name: Flutter clean
26+
run: flutter clean
2327
- name: Install dependencies
2428
run: flutter pub get
2529
- name: Generate l10n
@@ -54,7 +58,7 @@ jobs:
5458
- uses: actions/checkout@v3
5559
- uses: subosito/flutter-action@v2
5660
with:
57-
flutter-version: '3.22.0'
61+
flutter-version: '3.24.0'
5862
channel: 'stable'
5963
- name: Flutter doctor
6064
run: flutter doctor

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Flutter
1616
uses: subosito/flutter-action@v2
1717
with:
18-
flutter-version: '3.22.0'
18+
flutter-version: '3.24.0'
1919

2020
- name: Install dependencies
2121
run: flutter pub get

android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
2424

2525
android {
2626
namespace "com.example.run_flutter_run"
27-
compileSdkVersion 33
27+
compileSdkVersion 34
2828
ndkVersion flutter.ndkVersion
2929

3030
compileOptions {
@@ -33,7 +33,7 @@ android {
3333
}
3434

3535
kotlinOptions {
36-
jvmTarget = '1.8'
36+
jvmTarget = '17'
3737
}
3838

3939
sourceSets {
@@ -65,6 +65,6 @@ flutter {
6565
}
6666

6767
dependencies {
68-
ext.kotlin_version = '1.9.20'
68+
ext.kotlin_version = '2.0.10'
6969
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7070
}

android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
allprojects {
2+
ext.kotlin_version = '2.0.10'
23
repositories {
34
google()
45
mavenCentral()

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pluginManagement {
2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2222
id "com.android.application" version "7.3.0" apply false
23-
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23+
id "org.jetbrains.kotlin.android" version "2.0.10" apply false
2424
}
2525

2626
include ":app"

ios/Podfile.lock

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ PODS:
1515
- Flutter
1616
- image_picker_ios (0.0.1):
1717
- Flutter
18+
- package_info_plus (0.4.5):
19+
- Flutter
1820
- path_provider_foundation (0.0.1):
1921
- Flutter
2022
- FlutterMacOS
@@ -24,7 +26,7 @@ PODS:
2426
- Flutter
2527
- FlutterMacOS
2628
- TOCropViewController (2.6.1)
27-
- wakelock (0.0.1):
29+
- wakelock_plus (0.0.1):
2830
- Flutter
2931

3032
DEPENDENCIES:
@@ -36,10 +38,11 @@ DEPENDENCIES:
3638
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
3739
- image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
3840
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
41+
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
3942
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
4043
- share_plus (from `.symlinks/plugins/share_plus/ios`)
4144
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
42-
- wakelock (from `.symlinks/plugins/wakelock/ios`)
45+
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
4346

4447
SPEC REPOS:
4548
trunk:
@@ -62,29 +65,32 @@ EXTERNAL SOURCES:
6265
:path: ".symlinks/plugins/image_gallery_saver/ios"
6366
image_picker_ios:
6467
:path: ".symlinks/plugins/image_picker_ios/ios"
68+
package_info_plus:
69+
:path: ".symlinks/plugins/package_info_plus/ios"
6570
path_provider_foundation:
6671
:path: ".symlinks/plugins/path_provider_foundation/darwin"
6772
share_plus:
6873
:path: ".symlinks/plugins/share_plus/ios"
6974
shared_preferences_foundation:
7075
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
71-
wakelock:
72-
:path: ".symlinks/plugins/wakelock/ios"
76+
wakelock_plus:
77+
:path: ".symlinks/plugins/wakelock_plus/ios"
7378

7479
SPEC CHECKSUMS:
7580
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
7681
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
7782
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
7883
flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
79-
geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
84+
geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
8085
image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25
8186
image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
82-
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
83-
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
84-
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
85-
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
87+
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
88+
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
89+
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
90+
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
91+
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
8692
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
87-
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
93+
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
8894

8995
PODFILE CHECKSUM: 2442f0b84dc733c75ff32e76bcf04626a168288b
9096

ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

lib/presentation/common/timer/viewmodel/timer_view_model.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:async';
22

33
import 'package:hooks_riverpod/hooks_riverpod.dart';
4-
import 'package:wakelock/wakelock.dart';
4+
import 'package:wakelock_plus/wakelock_plus.dart';
55

66
import '../../../../../main.dart';
77
import '../../core/services/text_to_speech_service.dart';
@@ -32,7 +32,7 @@ class TimerViewModel extends StateNotifier<TimerState> {
3232
timer = Timer.periodic(_timerDuration, updateTime);
3333
if (!isRunning) {
3434
ref.read(textToSpeechService).sayGoodLuck();
35-
Wakelock.enable();
35+
WakelockPlus.enable();
3636
} else {
3737
ref.read(textToSpeechService).sayResume();
3838
ref.read(locationViewModelProvider.notifier).resumeLocationStream();
@@ -109,7 +109,7 @@ class TimerViewModel extends StateNotifier<TimerState> {
109109
stopwatch.reset();
110110
timer?.cancel();
111111
state = state.copyWith(isRunning: false);
112-
Wakelock.disable();
112+
WakelockPlus.disable();
113113
}
114114

115115
void navigateToSummaryScreen() {

0 commit comments

Comments
 (0)