diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk new file mode 120000 index 0000000..598eb2c --- /dev/null +++ b/.fvm/flutter_sdk @@ -0,0 +1 @@ +/Users/zik/fvm/versions/3.7.5 \ No newline at end of file diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json new file mode 100644 index 0000000..cdcbbc3 --- /dev/null +++ b/.fvm/fvm_config.json @@ -0,0 +1,4 @@ +{ + "flutterSdkVersion": "3.7.5", + "flavors": {} +} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 1d1f0af..bcce007 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -21,14 +21,17 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace = "com.example.queuing_system" compileSdkVersion flutter.compileSdkVersion compileOptions { + compileSdkVersion 34 sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -44,10 +47,12 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.queuing_system" - minSdkVersion localProperties.getProperty('flutter.minSdkVersion').toInteger() - targetSdkVersion flutter.targetSdkVersion + minSdkVersion 24 +// minSdkVersion localProperties.getProperty('flutter.minSdkVersion').toInteger() + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true } buildTypes { @@ -65,4 +70,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' + } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9b4b6a4..5a6de5c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,34 +1,55 @@ + + + + + - + android:icon="@mipmap/ic_launcher" + android:label="queuing_system"> + + + + + + + + + + + + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" /> - - + +