From 070bd9a2ba362b446333a34e9ff0c4a05dd1d005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr> Date: Tue, 15 Feb 2022 23:11:21 +0100 Subject: [PATCH] Upgrade flutter framework and dependencies --- android/app/build.gradle | 23 +++---------------- android/app/src/main/AndroidManifest.xml | 14 ++++------- .../puissance4/MainActivity.java | 6 +++++ .../fluttercheckers/MainActivity.kt | 12 ---------- android/build.gradle | 4 +--- android/gradle.properties | 5 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 18 ++++++--------- pubspec.lock | 15 ++++++++---- pubspec.yaml | 3 ++- 10 files changed, 38 insertions(+), 64 deletions(-) create mode 100644 android/app/src/main/java/org/benoitharrault/puissance4/MainActivity.java delete mode 100644 android/app/src/main/kotlin/dev/benoitharrault/fluttercheckers/MainActivity.kt diff --git a/android/app/build.gradle b/android/app/build.gradle index df8e916..126b1bb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -16,7 +16,7 @@ if (gradlePropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def appVersionCode = gradleProperties.getProperty('app.versionCode') @@ -30,7 +30,6 @@ if (appVersionName == null) { } apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" def keystoreProperties = new Properties() @@ -40,24 +39,15 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 28 - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - disable 'InvalidPackage' - } + compileSdkVersion 31 defaultConfig { applicationId "org.benoitharrault.puissance4" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 30 versionCode appVersionCode.toInteger() versionName appVersionName archivesBaseName = "$applicationId" + "_" + "$versionCode" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } signingConfigs { @@ -78,10 +68,3 @@ android { flutter { source '../..' } - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2db8d6c..86d7c00 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,12 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.benoitharrault.puissance4"> - <!-- io.flutter.app.FlutterApplication is an android.app.Application that - calls FlutterMain.startInitialization(this); in its onCreate method. - In most cases you can leave this as-is, but you if you want to provide - additional functionality it is fine to subclass or reimplement - FlutterApplication and put your custom class here. --> - <application - android:name="io.flutter.app.FlutterApplication" + <application android:label="puissance4" android:icon="@mipmap/ic_launcher"> <activity @@ -16,13 +10,15 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + <meta-data + android:name="io.flutter.embedding.android.SplashScreenDrawable" + android:resource="@drawable/launch_background" + /> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> - <!-- Don't delete the meta-data below. - This is used by the Flutter tool to generate GeneratedPluginRegistrant.java --> <meta-data android:name="flutterEmbedding" android:value="2" /> diff --git a/android/app/src/main/java/org/benoitharrault/puissance4/MainActivity.java b/android/app/src/main/java/org/benoitharrault/puissance4/MainActivity.java new file mode 100644 index 0000000..bdc222a --- /dev/null +++ b/android/app/src/main/java/org/benoitharrault/puissance4/MainActivity.java @@ -0,0 +1,6 @@ +package org.benoitharrault.puissance4; + +import io.flutter.embedding.android.FlutterActivity; + +public class MainActivity extends FlutterActivity { +} diff --git a/android/app/src/main/kotlin/dev/benoitharrault/fluttercheckers/MainActivity.kt b/android/app/src/main/kotlin/dev/benoitharrault/fluttercheckers/MainActivity.kt deleted file mode 100644 index c63f773..0000000 --- a/android/app/src/main/kotlin/dev/benoitharrault/fluttercheckers/MainActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.benoitharrault.puissance4 - -import androidx.annotation.NonNull; -import io.flutter.embedding.android.FlutterActivity -import io.flutter.embedding.engine.FlutterEngine -import io.flutter.plugins.GeneratedPluginRegistrant - -class MainActivity: FlutterActivity() { - override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - } -} diff --git a/android/build.gradle b/android/build.gradle index 3100ad2..c9e3db0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,13 +1,11 @@ buildscript { - ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:4.1.0' } } diff --git a/android/gradle.properties b/android/gradle.properties index 271a5ad..9a7fb49 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true -app.versionName=1.0.9 -app.versionCode=10 +app.versionName=1.0.10 +app.versionCode=11 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 296b146..bc6a58a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -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-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14f..44e62bc 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,15 +1,11 @@ include ':app' -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } -} +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +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" diff --git a/pubspec.lock b/pubspec.lock index 6b16bae..3317f5f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -67,6 +67,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -127,7 +134,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: @@ -141,6 +148,6 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index f8cd312..1867ede 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,9 +1,10 @@ name: puissance4 description: puissance4 +publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.2.2 <3.0.0" + sdk: ">=2.7.0 <3.0.0" dependencies: flutter: -- GitLab