fix bug: manifest冲突

Author: huangshouguo

app/build.gradle

@@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.github.ihsg.patternlocker.demo"

build.gradle

@@ -4,8 +4,8 @@ buildscript {
 
     // versions
     ext {
-        versionCode = 12
-        versionName = '2.4.3'
+        versionCode = 13
+        versionName = '2.4.4'
 
         minSdkVersion = 15
         targetSdkVersion = 28

library/build.gradle

@@ -6,16 +6,12 @@ group = 'com.github.ihsg'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -26,12 +22,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
-    androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoCoreVersion", {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    compileOnly "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 }

library/src/main/AndroidManifest.xml

@@ -1,11 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.ihsg.patternlocker">
-
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
+<manifest package="com.github.ihsg.patternlocker"/>

library/src/main/java/com/github/ihsg/patternlocker/CellFactory.kt

@@ -5,7 +5,6 @@ package com.github.ihsg.patternlocker
  */
 
 internal class CellFactory(private val width: Int, private val height: Int) {
-    val TAG = "CellFactory"
     val cellBeanList: List<CellBean> by lazy {
         val result = ArrayList<CellBean>()
         result.clear()
@@ -14,16 +13,14 @@ internal class CellFactory(private val width: Int, private val height: Int) {
         val pHeight = this.height / 8f
 
         for (i: Int in 0..2) {
-            Logger.d(TAG, "i = $i")
             for (j: Int in 0..2) {
-                Logger.d(TAG, "j = $j")
                 val id = (i * 3 + j) % 9
                 val x = (j * 3 + 1) * pWidth
                 val y = (i * 3 + 1) * pHeight
                 result.add(CellBean(id, x, y, pWidth))
             }
         }
-        Logger.d(TAG, "result = $result")
+        Logger.d("CellFactory", "result = $result")
         return@lazy result
     }
 }