Skip to content

Commit 93d386b

Browse files
committed
Update Laundry app ui to dart3
null safety update plugins
1 parent 254b179 commit 93d386b

28 files changed

+363
-264
lines changed

.DS_Store

-2 KB
Binary file not shown.

laundry_app_ui/.idea/libraries/Dart_SDK.xml

Lines changed: 21 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

laundry_app_ui/.idea/workspace.xml

Lines changed: 91 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

laundry_app_ui/.packages

Lines changed: 0 additions & 51 deletions
This file was deleted.

laundry_app_ui/android/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion 34
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
@@ -39,8 +39,8 @@ android {
3939
defaultConfig {
4040
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4141
applicationId "com.example.laundry_app_ui"
42-
minSdkVersion 16
43-
targetSdkVersion 29
42+
minSdkVersion flutter.minSdkVersion
43+
targetSdkVersion 34
4444
versionCode flutterVersionCode.toInteger()
4545
versionName flutterVersionName
4646
}
@@ -59,5 +59,5 @@ flutter {
5959
}
6060

6161
dependencies {
62-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
62+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10"
6363
}

laundry_app_ui/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
additional functionality it is fine to subclass or reimplement
77
FlutterApplication and put your custom class here. -->
88
<application
9-
android:name="io.flutter.app.FlutterApplication"
9+
android:name="${applicationName}"
1010
android:label="laundry_app_ui"
1111
android:icon="@mipmap/ic_launcher">
1212
<activity
1313
android:name=".MainActivity"
14+
android:exported="true"
1415
android:launchMode="singleTop"
1516
android:theme="@style/LaunchTheme"
1617
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

laundry_app_ui/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import androidx.annotation.Keep;
44
import androidx.annotation.NonNull;
5+
import io.flutter.Log;
56

67
import io.flutter.embedding.engine.FlutterEngine;
78

@@ -12,7 +13,12 @@
1213
*/
1314
@Keep
1415
public final class GeneratedPluginRegistrant {
16+
private static final String TAG = "GeneratedPluginRegistrant";
1517
public static void registerWith(@NonNull FlutterEngine flutterEngine) {
16-
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
18+
try {
19+
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
20+
} catch (Exception e) {
21+
Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
22+
}
1723
}
1824
}

laundry_app_ui/android/app/src/main/kotlin/com/example/laundry_app_ui/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ package com.example.laundry_app_ui
33
import io.flutter.embedding.android.FlutterActivity
44

55
class MainActivity: FlutterActivity() {
6-
}
6+
}

laundry_app_ui/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.7.10'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
9+
classpath 'com.android.tools.build:gradle:7.4.1' // Ensure you are using a compatible version
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
1111
}
1212
}
1313

@@ -26,6 +26,6 @@ subprojects {
2626
project.evaluationDependsOn(':app')
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register("clean", Delete) {
3030
delete rootProject.buildDir
3131
}

laundry_app_ui/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip

0 commit comments

Comments
 (0)