Skip to content

Commit

Permalink
chore(deps): update flutter to v3.19.3 (#147)
Browse files Browse the repository at this point in the history
* chore(deps): update flutter to v3.19.3

* chore(gradle): bump gradle version

* fix(ci): set correct version for Flutter

* fix(lint): remove use_build_context_synchronously linting error

* fix(android): add missing package name

* chore(ci): bump JAVA version to 17

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Valentin REVERSAT <[email protected]>
  • Loading branch information
renovate[bot] and vareversat committed Apr 21, 2024
1 parent e55f83b commit 612fa1a
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 54 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
flutter-test-analyze:
uses: ./.github/workflows/flutter.analyze-test.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
secrets:
passphrase: ${{ secrets.PASSPHRASE }}
flutter-build:
needs: [flutter-test-analyze]
uses: ./.github/workflows/flutter.build.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
android_output: 'apk'
env: 'dev'
secrets:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
flutter-test-analyze:
uses: ./.github/workflows/flutter.analyze-test.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
secrets:
passphrase: ${{ secrets.PASSPHRASE }}
page:
Expand All @@ -18,7 +18,7 @@ jobs:
needs: [flutter-test-analyze]
uses: ./.github/workflows/flutter.build.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
android_output: 'aab'
env: 'dev'
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flutter.build.action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11.x'
java-version: '17.x'
- name: 'Setup Flutter'
uses: subosito/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
flutter-test-analyze:
uses: ./.github/workflows/flutter.analyze-test.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
secrets:
passphrase: ${{ secrets.PASSPHRASE }}
flutter-build:
needs: [flutter-test-analyze]
uses: ./.github/workflows/flutter.build.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
android_output: 'aab'
env: 'prd'
secrets:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
flutter-test-analyze:
uses: ./.github/workflows/flutter.analyze-test.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
secrets:
passphrase: ${{ secrets.PASSPHRASE }}
flutter-build:
needs: [flutter-test-analyze]
uses: ./.github/workflows/flutter.build.action.yaml
with:
flutter_version: '3.16.9'
flutter_version: '3.19.3'
android_output: 'aab'
env: 'beta'
secrets:
Expand Down
24 changes: 12 additions & 12 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

ext.kotlin_version = '1.7.10'

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +14,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -21,17 +24,14 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
namespace = "fr.vareversat.chabo"

compileSdkVersion 33

Expand All @@ -42,8 +42,8 @@ android {
// https://pub.dev/packages/flutter_local_notifications/
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

defaultConfig {
Expand Down Expand Up @@ -83,5 +83,5 @@ dependencies {
// https://github.com/flutter/flutter/issues/110658
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
// https://pub.dev/packages/flutter_local_notifications/
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23"
}
13 changes: 0 additions & 13 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
buildscript {
ext.kotlin_version = '1.9.23'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
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 @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
30 changes: 22 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()

def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.1.2" apply false
id "org.jetbrains.kotlin.android" version "1.9.23" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion lib/bloc/scroll_status/scroll_status_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ScrollStatusBloc extends Bloc<ScrollStatusEvent, ScrollStatusState> {
);
}

// ignore: use_build_context_synchronously
if (!targetContext.mounted) return;
Scrollable.ensureVisible(
targetContext,
duration: const Duration(seconds: 1),
Expand Down
42 changes: 33 additions & 9 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.8.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -489,26 +513,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -577,10 +601,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: transitive
description:
Expand Down Expand Up @@ -1100,4 +1124,4 @@ packages:
version: "3.1.2"
sdks:
dart: ">=3.2.3 <4.0.0"
flutter: ">=3.16.9"
flutter: ">=3.19.3"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2.5.2

environment:
sdk: '>=3.0.0 <4.0.0'
flutter: '3.16.9'
flutter: '3.19.3'

dependencies:
animated_toggle_switch: ^0.8.0
Expand Down

0 comments on commit 612fa1a

Please sign in to comment.