From 5bf2781be24449302c2ec5f5f97784920549fdc2 Mon Sep 17 00:00:00 2001 From: Sudharshan Date: Fri, 8 Mar 2019 16:26:38 +0800 Subject: [PATCH] feat: testing swift and kotlin support --- android/app/build.gradle | 6 + android/app/src/main/AndroidManifest.xml | 4 - .../example/frontendflutter/MainActivity.java | 13 --- .../example/frontendflutter/MainActivity.kt | 13 +++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 5454 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2601 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 9130 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 15249 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 22947 -> 1443 bytes android/build.gradle | 7 +- ios/Podfile | 2 + ios/Runner.xcodeproj/project.pbxproj | 108 +++++++++--------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -- .../xcshareddata/xcschemes/Runner.xcscheme | 4 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -- ios/Runner/AppDelegate.h | 6 - ios/Runner/AppDelegate.m | 13 --- ios/Runner/AppDelegate.swift | 13 +++ .../Icon-App-1024x1024@1x.png | Bin 137879 -> 11112 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 687 -> 564 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 1922 -> 1283 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 3859 -> 1588 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 1143 -> 1025 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 3676 -> 1716 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 7749 -> 1920 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 1922 -> 1283 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 6678 -> 1895 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 13333 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 13333 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 18703 -> 3831 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 6007 -> 1888 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 15893 -> 3294 bytes .../Icon-App-83.5x83.5@2x.png | Bin 17195 -> 3612 bytes ios/Runner/Info.plist | 2 +- ios/Runner/Runner-Bridging-Header.h | 1 + ios/Runner/main.m | 9 -- 36 files changed, 97 insertions(+), 120 deletions(-) delete mode 100644 android/app/src/main/java/com/example/frontendflutter/MainActivity.java create mode 100644 android/app/src/main/kotlin/com/example/frontendflutter/MainActivity.kt delete mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 ios/Runner/AppDelegate.h delete mode 100644 ios/Runner/AppDelegate.m create mode 100644 ios/Runner/AppDelegate.swift create mode 100644 ios/Runner/Runner-Bridging-Header.h delete mode 100644 ios/Runner/main.m diff --git a/android/app/build.gradle b/android/app/build.gradle index 4ff3be6..ee2b42d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -22,11 +22,16 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion 27 + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + lintOptions { disable 'InvalidPackage' } @@ -55,6 +60,7 @@ flutter { } dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1ceed2f..066d4be 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,10 +6,6 @@ to allow setting breakpoints, to provide hot reload, etc. --> - - - -