From fe69221788964202a883fcf2465c0c502e4aff4c Mon Sep 17 00:00:00 2001 From: puyang1017 Date: Tue, 29 Jan 2019 13:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- puymvpkotlin/.gitignore | 1 - puymvpkotlin/build.gradle | 30 ------------------- puymvpkotlin/proguard-rules.pro | 21 ------------- .../puymvpkotlin/ExampleInstrumentedTest.java | 26 ---------------- puymvpkotlin/src/main/AndroidManifest.xml | 2 -- puymvpkotlin/src/main/res/values/strings.xml | 3 -- .../puy/puymvpkotlin/ExampleUnitTest.java | 17 ----------- settings.gradle | 2 +- 8 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 puymvpkotlin/.gitignore delete mode 100644 puymvpkotlin/build.gradle delete mode 100644 puymvpkotlin/proguard-rules.pro delete mode 100644 puymvpkotlin/src/androidTest/java/com/android/puy/puymvpkotlin/ExampleInstrumentedTest.java delete mode 100644 puymvpkotlin/src/main/AndroidManifest.xml delete mode 100644 puymvpkotlin/src/main/res/values/strings.xml delete mode 100644 puymvpkotlin/src/test/java/com/android/puy/puymvpkotlin/ExampleUnitTest.java diff --git a/puymvpkotlin/.gitignore b/puymvpkotlin/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/puymvpkotlin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/puymvpkotlin/build.gradle b/puymvpkotlin/build.gradle deleted file mode 100644 index cab9e76..0000000 --- a/puymvpkotlin/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode rootProject.ext.android.versionCode - versionName rootProject.ext.android.versionName - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - sourceSets { main { java.srcDirs = ['src/main/java', 'src/main/kotlin'] } } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'com.android.support:appcompat-v7:28.0.0' - 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/puymvpkotlin/proguard-rules.pro b/puymvpkotlin/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/puymvpkotlin/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/puymvpkotlin/src/androidTest/java/com/android/puy/puymvpkotlin/ExampleInstrumentedTest.java b/puymvpkotlin/src/androidTest/java/com/android/puy/puymvpkotlin/ExampleInstrumentedTest.java deleted file mode 100644 index 5f61b50..0000000 --- a/puymvpkotlin/src/androidTest/java/com/android/puy/puymvpkotlin/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.android.puy.puymvpkotlin; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.android.puy.puymvpkotlin.test", appContext.getPackageName()); - } -} diff --git a/puymvpkotlin/src/main/AndroidManifest.xml b/puymvpkotlin/src/main/AndroidManifest.xml deleted file mode 100644 index 5200530..0000000 --- a/puymvpkotlin/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/puymvpkotlin/src/main/res/values/strings.xml b/puymvpkotlin/src/main/res/values/strings.xml deleted file mode 100644 index ca49669..0000000 --- a/puymvpkotlin/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - puymvpkotlin - diff --git a/puymvpkotlin/src/test/java/com/android/puy/puymvpkotlin/ExampleUnitTest.java b/puymvpkotlin/src/test/java/com/android/puy/puymvpkotlin/ExampleUnitTest.java deleted file mode 100644 index 48c0f3a..0000000 --- a/puymvpkotlin/src/test/java/com/android/puy/puymvpkotlin/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.android.puy.puymvpkotlin; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 970ffb6..c39effb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':puymvpjava', ':puymvpkotlin' +include ':app', ':puymvpjava'