From aefeecae901383bddf1ecf70d1725596ac6cc2da Mon Sep 17 00:00:00 2001
From: Jieyi <pokkbaby@gmail.com>
Date: Tue, 23 Jan 2018 14:28:08 +0900
Subject: [PATCH] Added that import this project library with dependencies
 library together.

---
 README.md                                    | 10 +++++-----
 gradle.properties                            |  2 +-
 kotlinknifer/build.gradle                    | 19 ++++++++++++-------
 kotlinknifer/src/main/AndroidManifest.xml    |  3 +--
 kotlinknifer/src/main/res/values/strings.xml |  3 ---
 sample/src/main/AndroidManifest.xml          |  6 ++++--
 6 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 kotlinknifer/src/main/res/values/strings.xml

diff --git a/README.md b/README.md
index b93f4c8..427eab2 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ allprojects {
 And add our dependency to your app `bundle.gradle`.
 
 ```gradle
-implementation 'com.devrapid.jieyi:kotlinknifer:1.1.7'
+implementation 'com.devrapid.jieyi:kotlinknifer:1.2.0'
 ```
 
 Then you can use it!!!
@@ -55,7 +55,7 @@ Then you can use it!!!
 <dependency>
   <groupId>com.devrapid.jieyi</groupId>
   <artifactId>kotlinknifer</artifactId>
-  <version>1.1.7</version>
+  <version>1.2.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -63,14 +63,14 @@ Then you can use it!!!
 # Also Included Library
 
 1. Gson 2.8.2
-2. RxJava 2.1.6
-3. RxKotlin 2.1.0
+2. RxJava 2.1.8
+3. RxKotlin 2.2.0
 4. Glide 4.0.0
 
 If you'd not like to use them to your project, you can add the exclude as like below
 
 ```gradle
-implementation('com.devrapid.jieyi:kotlinknifer:1.1.7', {
+implementation('com.devrapid.jieyi:kotlinknifer:1.2.0', {
   exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
   exclude group: 'io.reactivex.rxjava2', module: 'rxkotlin'
   exclude group: 'com.google.code.gson', module: 'gson'
diff --git a/gradle.properties b/gradle.properties
index c32e681..a392038 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ proj_name=kotlinknifer
 proj_libname=KotlinKnifer
 proj_group=com.devrapid.jieyi
 proj_artifactid=kotlinknifer
-proj_version=1.1.7
+proj_version=1.2.0
 proj_description=For developing an Android conveniently and rapidly.
 proj_websiteurl=https://github.com/pokk/KotlinKnifer
 proj_issuetrackerurl=https://github.com/pokk/KotlinKnifer/issues
diff --git a/kotlinknifer/build.gradle b/kotlinknifer/build.gradle
index 740c838..3300717 100644
--- a/kotlinknifer/build.gradle
+++ b/kotlinknifer/build.gradle
@@ -19,14 +19,19 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
-    implementation "io.reactivex.rxjava2:rxkotlin:2.1.0"
-    implementation "io.reactivex.rxjava2:rxjava:2.1.6"
-    implementation "com.github.bumptech.glide:glide:4.0.0"
+
+    // 'compile' can also import to the new project with this.
+    compile "com.google.code.gson:gson:2.8.2"
+    compile "io.reactivex.rxjava2:rxkotlin:2.2.0"
+    compile "io.reactivex.rxjava2:rxjava:2.1.8"
+    compile "com.github.bumptech.glide:glide:4.0.0"
+
+    // 'implementation' can't import to the new project.
     implementation "org.jetbrains.anko:anko-commons:0.10.4"
-    implementation "com.android.support:appcompat-v7:26.1.0"
-    implementation "com.android.support:recyclerview-v7:26.1.0"
-    implementation "com.android.support:palette-v7:26.1.0"
+
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'com.android.support:palette-v7:26.1.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/pokk/JCenterUploader/master/Uploader.gradle'
diff --git a/kotlinknifer/src/main/AndroidManifest.xml b/kotlinknifer/src/main/AndroidManifest.xml
index d7a8087..a75e2f7 100644
--- a/kotlinknifer/src/main/AndroidManifest.xml
+++ b/kotlinknifer/src/main/AndroidManifest.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
+        android:label="Kotlinknifer"
         android:supportsRtl="true">
     </application>
 </manifest>
diff --git a/kotlinknifer/src/main/res/values/strings.xml b/kotlinknifer/src/main/res/values/strings.xml
deleted file mode 100644
index 311d3d9..0000000
--- a/kotlinknifer/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Kotlinknifer</string>
-</resources>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index ba39174..b7624f7 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.devrapid.utils"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -8,7 +9,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:label">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>