From 0512a3406e591a55925b6046f129447865255a34 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 13:45:41 -0700 Subject: [PATCH] Fix build issues on Android --- .../flutter/flutter_wonders_app/MainActivity.kt | 6 ------ .../kotlin/com/gskinner/wonders/MainActivity.kt | 15 --------------- .../Flutter/ephemeral/Flutter-Generated.xcconfig | 8 ++++---- .../ephemeral/flutter_export_environment.sh | 8 ++++---- 4 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt delete mode 100644 android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt diff --git a/android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt b/android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt deleted file mode 100644 index babf1c44..00000000 --- a/android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.gskinner.flutter.flutter_wonders_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt b/android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt deleted file mode 100644 index 6c98efb9..00000000 --- a/android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.gskinner.flutter.wonders - -import android.os.Bundle -import com.google.android.gms.maps.MapsInitializer -import com.google.android.gms.maps.OnMapsSdkInitializedCallback -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity(), OnMapsSdkInitializedCallback { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - MapsInitializer.initialize(applicationContext, MapsInitializer.Renderer.LATEST, this) - } - - override fun onMapsSdkInitialized(p0: MapsInitializer.Renderer) {} -} diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig index 28393795..a4c49085 100644 --- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -1,10 +1,10 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=C:\_dev\sdks\flutter -FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app +FLUTTER_ROOT=/Users/shawn/Dev/flutter +FLUTTER_APPLICATION_PATH=/Users/shawn/Dev/gskinner/flutter-wonders-app COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_BUILD_DIR=build -FLUTTER_BUILD_NAME=1.9.7 -FLUTTER_BUILD_NUMBER=1.9.7 +FLUTTER_BUILD_NAME=2.0.3 +FLUTTER_BUILD_NUMBER=2.0.3 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=true TREE_SHAKE_ICONS=false diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh index c6874b00..bc10aa9a 100755 --- a/macos/Flutter/ephemeral/flutter_export_environment.sh +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -1,11 +1,11 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=C:\_dev\sdks\flutter" -export "FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app" +export "FLUTTER_ROOT=/Users/shawn/Dev/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/shawn/Dev/gskinner/flutter-wonders-app" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_BUILD_DIR=build" -export "FLUTTER_BUILD_NAME=1.9.7" -export "FLUTTER_BUILD_NUMBER=1.9.7" +export "FLUTTER_BUILD_NAME=2.0.3" +export "FLUTTER_BUILD_NUMBER=2.0.3" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false"