From 122d88bba5f5ad72639865a39860847402870059 Mon Sep 17 00:00:00 2001 From: tommyxchow Date: Thu, 16 Dec 2021 01:13:23 -0500 Subject: [PATCH] Update files to match latest template --- android/.gitignore | 2 ++ android/app/build.gradle | 13 +++++++++-- android/app/src/main/AndroidManifest.xml | 2 ++ .../com/example/default_app/MainActivity.kt | 6 +++++ .../app/src/main/res/values-night/styles.xml | 2 +- android/app/src/main/res/values/styles.xml | 2 +- android/build.gradle | 6 +++-- ios/.gitignore | 1 + ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Runner.xcodeproj/project.pbxproj | 22 +++++++++++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 10 +++----- ios/Runner/Info.plist | 4 +++- pubspec.yaml | 4 ++-- web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 10 ++++++-- web/manifest.json | 12 ++++++++++ 17 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 android/app/src/main/kotlin/com/example/default_app/MainActivity.kt create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png diff --git a/android/.gitignore b/android/.gitignore index 0a741cb4..6f568019 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index 7806dbfc..318fe52e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,16 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion flutter.compileSdkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +45,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.frosty" minSdkVersion 20 - targetSdkVersion 30 + targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index bd2f0a65..06769259 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,9 +2,11 @@ package="com.example.frosty">