diff --git a/LICENSE b/LICENSE index 8dada3e..e1ecc40 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright {2017} {Jieyi Wu} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 4c972b3..76ff938 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ ideas or problems. Please let me know, thank you! # License +``` Copyright (C) 2017 Jieyi Wu Licensed under the Apache License, Version 2.0 (the "License"); @@ -77,3 +78,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +``` \ No newline at end of file diff --git a/app/src/androidTest/java/com/devrapid/utils/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/devrapid/utils/ExampleInstrumentedTest.java deleted file mode 100644 index 3d9519f..0000000 --- a/app/src/androidTest/java/com/devrapid/utils/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.devrapid.utils; - -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.assertEquals; - -/** - * Instrumentation test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.devrapid.utils", appContext.getPackageName()); - } -} diff --git a/app/src/test/java/com/devrapid/utils/ExampleUnitTest.java b/app/src/test/java/com/devrapid/utils/ExampleUnitTest.java deleted file mode 100644 index 91482e2..0000000 --- a/app/src/test/java/com/devrapid/utils/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.devrapid.utils; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/kotlinknifer/build.gradle b/kotlinknifer/build.gradle index 4384e19..5196ed3 100644 --- a/kotlinknifer/build.gradle +++ b/kotlinknifer/build.gradle @@ -23,12 +23,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile group: 'com.google.code.gson', name: 'gson', version: '2.8.1' compile "io.reactivex.rxjava2:rxkotlin:2.1.0" compile "io.reactivex.rxjava2:rxjava:2.1.3" compile "com.android.support:appcompat-v7:25.3.1" - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } apply from: 'https://raw.githubusercontent.com/pokk/JCenterUploader/master/Uploader.gradle' diff --git a/app/.gitignore b/sample/.gitignore similarity index 100% rename from app/.gitignore rename to sample/.gitignore diff --git a/app/build.gradle b/sample/build.gradle similarity index 100% rename from app/build.gradle rename to sample/build.gradle diff --git a/app/proguard-rules.pro b/sample/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to sample/proguard-rules.pro diff --git a/app/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to sample/src/main/AndroidManifest.xml diff --git a/app/src/main/java/com/devrapid/utils/MainActivity.kt b/sample/src/main/java/com/devrapid/utils/MainActivity.kt similarity index 100% rename from app/src/main/java/com/devrapid/utils/MainActivity.kt rename to sample/src/main/java/com/devrapid/utils/MainActivity.kt diff --git a/app/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml similarity index 100% rename from app/src/main/res/layout/activity_main.xml rename to sample/src/main/res/layout/activity_main.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/sample/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.png rename to sample/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to sample/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/sample/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.png rename to sample/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to sample/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to sample/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to sample/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to sample/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to sample/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to sample/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index faacd78..9d18ee6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':kotlinknifer' +include ':sample', ':kotlinknifer'