Skip to content

Commit

Permalink
upgrade to flutter 3.24 (#61)
Browse files Browse the repository at this point in the history
* upgrade to flutter 3.24
  • Loading branch information
BenjaminCanape authored Aug 10, 2024
1 parent bc268ba commit 5b06027
Show file tree
Hide file tree
Showing 12 changed files with 230 additions and 218 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.0'
flutter-version: '3.24.0'
- name: Clean Gradle cache
run: rm -rf ~/.gradle/caches/
- name: Flutter clean
run: flutter clean
- name: Install dependencies
run: flutter pub get
- name: Generate l10n
Expand Down Expand Up @@ -54,7 +58,7 @@ jobs:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.0'
flutter-version: '3.24.0'
channel: 'stable'
- name: Flutter doctor
run: flutter doctor
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.0'
flutter-version: '3.24.0'

- name: Install dependencies
run: flutter pub get
Expand Down
14 changes: 5 additions & 9 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ if (flutterVersionName == null) {

android {
namespace "com.example.run_flutter_run"
compileSdkVersion 33
compileSdkVersion 34
ndkVersion flutter.ndkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
kotlin {
jvmToolchain(17)
}

sourceSets {
Expand Down Expand Up @@ -64,7 +64,3 @@ flutter {
source '../..'
}

dependencies {
ext.kotlin_version = '1.9.20'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
7 changes: 7 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,10 @@ subprojects {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}

configurations.all {
resolutionStrategy {
force 'androidx.core:core:2.0.10'
force 'androidx.core:core-ktx:2.0.10'
}
}
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
kotlin.jvm.target.validation.mode = IGNORE
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.9-all.zip
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
id "org.jetbrains.kotlin.android" version "2.0.10" apply false
}

include ":app"
32 changes: 16 additions & 16 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ PODS:
- image_cropper (0.0.4):
- Flutter
- TOCropViewController (~> 2.6.1)
- image_gallery_saver (2.0.2):
- Flutter
- image_picker_ios (0.0.1):
- Flutter
- package_info_plus (0.4.5):
- Flutter
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
Expand All @@ -24,7 +24,7 @@ PODS:
- Flutter
- FlutterMacOS
- TOCropViewController (2.6.1)
- wakelock (0.0.1):
- wakelock_plus (0.0.1):
- Flutter

DEPENDENCIES:
Expand All @@ -34,12 +34,12 @@ DEPENDENCIES:
- flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)

SPEC REPOS:
trunk:
Expand All @@ -58,33 +58,33 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/geolocator_apple/ios"
image_cropper:
:path: ".symlinks/plugins/image_cropper/ios"
image_gallery_saver:
:path: ".symlinks/plugins/image_gallery_saver/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
wakelock_plus:
:path: ".symlinks/plugins/wakelock_plus/ios"

SPEC CHECKSUMS:
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25
image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1

PODFILE CHECKSUM: 2442f0b84dc733c75ff32e76bcf04626a168288b

Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import Flutter

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
6 changes: 3 additions & 3 deletions lib/presentation/common/timer/viewmodel/timer_view_model.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:async';

import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:wakelock/wakelock.dart';
import 'package:wakelock_plus/wakelock_plus.dart';

import '../../../../../main.dart';
import '../../core/services/text_to_speech_service.dart';
Expand Down Expand Up @@ -32,7 +32,7 @@ class TimerViewModel extends StateNotifier<TimerState> {
timer = Timer.periodic(_timerDuration, updateTime);
if (!isRunning) {
ref.read(textToSpeechService).sayGoodLuck();
Wakelock.enable();
WakelockPlus.enable();
} else {
ref.read(textToSpeechService).sayResume();
ref.read(locationViewModelProvider.notifier).resumeLocationStream();
Expand Down Expand Up @@ -109,7 +109,7 @@ class TimerViewModel extends StateNotifier<TimerState> {
stopwatch.reset();
timer?.cancel();
state = state.copyWith(isRunning: false);
Wakelock.disable();
WakelockPlus.disable();
}

void navigateToSummaryScreen() {
Expand Down
Loading

0 comments on commit 5b06027

Please sign in to comment.