From abe2bc76f7853a5a4b9a0b8df6efb9ebb6b279c6 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Tue, 24 Jul 2018 12:37:27 +0200 Subject: Using kotlin now --- android/.gitignore | 13 ----- android/.project | 17 ------- android/.settings/org.eclipse.buildship.core.prefs | 8 --- android/app/.classpath | 6 --- android/app/.project | 23 --------- .../app/.settings/org.eclipse.buildship.core.prefs | 2 - android/app/build.gradle | 54 --------------------- android/app/src/main/AndroidManifest.xml | 24 --------- .../beam_messenger/MainActivity.java | 14 ------ .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 0 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 0 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 0 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 0 bytes android/build.gradle | 35 ------------- android/gradle.properties | 1 - android/settings.gradle | 15 ------ 17 files changed, 212 deletions(-) delete mode 100644 android/.gitignore delete mode 100644 android/.project delete mode 100644 android/.settings/org.eclipse.buildship.core.prefs delete mode 100644 android/app/.classpath delete mode 100644 android/app/.project delete mode 100644 android/app/.settings/org.eclipse.buildship.core.prefs delete mode 100644 android/app/build.gradle delete mode 100644 android/app/src/main/AndroidManifest.xml delete mode 100644 android/app/src/main/java/de/beam_messenger/beam_messenger/MainActivity.java delete mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 android/build.gradle delete mode 100644 android/gradle.properties delete mode 100644 android/settings.gradle (limited to 'android') diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100644 index 1fd9325..0000000 --- a/android/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures -GeneratedPluginRegistrant.java - -/gradle -/gradlew -/gradlew.bat diff --git a/android/.project b/android/.project deleted file mode 100644 index 3964dd3..0000000 --- a/android/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - android - Project android created by Buildship. - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 22b1843..0000000 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -offline.mode=false -override.workspace.settings=true diff --git a/android/app/.classpath b/android/app/.classpath deleted file mode 100644 index 8d8d85f..0000000 --- a/android/app/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/app/.project b/android/app/.project deleted file mode 100644 index ac485d7..0000000 --- a/android/app/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - app - Project app created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/android/app/.settings/org.eclipse.buildship.core.prefs b/android/app/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index b1886ad..0000000 --- a/android/app/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=.. -eclipse.preferences.version=1 diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index 8e0ce10..0000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withInputStream { stream -> - localProperties.load(stream) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "de.beam_messenger.beam_messenger" - } - - buildTypes { - debug { - applicationIdSuffix '.debug' - versionNameSuffix '-DEBUG' - } - - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - androidTestCompile 'com.android.support:support-annotations:25.0.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' -} \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 3018739..0000000 --- a/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/java/de/beam_messenger/beam_messenger/MainActivity.java b/android/app/src/main/java/de/beam_messenger/beam_messenger/MainActivity.java deleted file mode 100644 index dc271a0..0000000 --- a/android/app/src/main/java/de/beam_messenger/beam_messenger/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.beam_messenger.beam_messenger; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b7..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 09d4391..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372e..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index 60b1490..0000000 --- a/android/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -buildscript { - repositories { - jcenter() - maven { - url "https://maven.google.com" - } - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - } -} - -allprojects { - repositories { - jcenter() - maven { - url "https://maven.google.com" - } - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" - project.evaluationDependsOn(':app') -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -task wrapper(type: Wrapper) { - gradleVersion = '2.14.1' -} diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100644 index 8bd86f6..0000000 --- a/android/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-Xmx1536M diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index 115da6c..0000000 --- a/android/settings.gradle +++ /dev/null @@ -1,15 +0,0 @@ -include ':app' - -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() - -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withInputStream { stream -> plugins.load(stream) } -} - -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} -- cgit v1.2.3