brickpop#24 Attempt to bring the template to flutter2

florianrein · Apr 24, 2021 · ff555fd · ff555fd
1 parent 8be00f6
commit ff555fd
Show file tree

Hide file tree

Showing 87 changed files with 130 additions and 2,061 deletions.
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
diff --git a/.idea/libraries/Flutter_for_Android.xml b/.idea/libraries/Flutter_for_Android.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations/example_lib_main_dart.xml b/.idea/runConfigurations/example_lib_main_dart.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/.gitignore b/android/.gitignore
@@ -1,8 +1,11 @@
-*.iml
-.gradle
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,6 +1,3 @@
-group 'org.mylib.mylib'
-version '1.0-SNAPSHOT'
-
 buildscript {
     ext.kotlin_version = '1.3.50'
     repositories {
@@ -9,36 +6,26 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
         jcenter()
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion 28
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-    defaultConfig {
-        minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    lintOptions {
-        disable 'InvalidPackage'
-    }
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1 +1,11 @@
-rootProject.name = 'mylib'
+include ':app'
+
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
+
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/jniLibs/arm64-v8a/libexample.so b/android/src/main/jniLibs/arm64-v8a/libexample.so
diff --git a/android/src/main/jniLibs/armeabi-v7a/libexample.so b/android/src/main/jniLibs/armeabi-v7a/libexample.so
diff --git a/android/src/main/jniLibs/x86/libexample.so b/android/src/main/jniLibs/x86/libexample.so
diff --git a/android/src/main/jniLibs/x86_64/libexample.so b/android/src/main/jniLibs/x86_64/libexample.so
diff --git a/android/src/main/kotlin/org/mylib/mylib/MylibPlugin.kt b/android/src/main/kotlin/org/mylib/mylib/MylibPlugin.kt
diff --git a/example/.gitignore b/example/.gitignore
diff --git a/example/.metadata b/example/.metadata
diff --git a/example/README.md b/example/README.md
diff --git a/example/android/.gitignore b/example/android/.gitignore
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle