Merge pull request #57 from freesith/master

适配build.gradle.kts文件的namespace格式

app/build.gradle

@@ -48,6 +48,7 @@ android {
 dependencies {
 
     implementation project(":base")
+    implementation project(":kts_test")
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.4.0'

app/xmlclassguard.gradle

@@ -18,8 +18,10 @@ xmlClassGuard {
     mappingFile = file("xml-class-mapping.txt")
     //更改manifest里package属性
     packageChange = ["com.ljx.example": "ab.cd",
-                     "com.ljx.base"   : "ggg.kkk"]
+                     "com.ljx.base"   : "ggg.kkk",
+                     "com.ljx.kts"    : "ff.dd"]
     //移动目录，支持同时移动多个目录
     moveDir = ["com.ljx.example": "ef.gh",
-               "com.ljx.base"   : "zzzz.hhhh"]
+               "com.ljx.base"   : "zzzz.hhhh",
+               "com.ljx.kts"    : "ddd.xxx"]
 }

kts_test/.gitignore

@@ -0,0 +1 @@
+/build

kts_test/build.gradle.kts

@@ -0,0 +1,42 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "com.ljx.kts"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 21
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.4.2")
+    implementation("com.google.android.material:material:1.4.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+}

kts_test/proguard-rules.pro

@@ -0,0 +1,21 @@
+# 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

kts_test/src/androidTest/java/com/ljx/kts/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.ljx.kts
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.ljx.kts.test", appContext.packageName)
+    }
+}

kts_test/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.ljx.kts">
+
+</manifest>

kts_test/src/main/java/com/ljx/kts/KtsTest.kt

@@ -0,0 +1,4 @@
+package com.ljx.kts
+
+class KtsTest {
+}

kts_test/src/test/java/com/ljx/kts/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.ljx.kts
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

plugin/src/main/java/com/xml/guard/tasks/PackageChangeTask.kt

@@ -78,6 +78,7 @@ open class PackageChangeTask @Inject constructor(
     private fun File.modifyBuildGradleFile(oldPackage: String, newPackage: String) {
         readText()
             .replace("namespace\\s+['\"]${oldPackage}['\"]".toRegex(), "namespace '$newPackage'")
+            .replace("namespace\\s*=\\s*['\"]${oldPackage}['\"]".toRegex(), """namespace = "$newPackage"""")
             .let { writeText(it) }
     }
 

settings.gradle

@@ -23,3 +23,4 @@ rootProject.name = "XmlClassGuard"
 include ':app'
 include ':plugin'
 include ':base'
+include ':kts_test'