support buildType

nnjun · nnjun · commit 25f799e768f2 · 2022-01-11T22:21:36.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application'
-//    id 'top.niunaijun.blackobfuscator'
+    id 'top.niunaijun.blackobfuscator'
 }
 
 android {
@@ -14,6 +14,7 @@ android {
         versionCode 1
         versionName "1.0"
 
+        flavorDimensions "default"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -22,17 +23,34 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+
+        googleplay {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    productFlavors {
+        app {
+            applicationId "com.ghosthing.ball"
+        }
+
     }
-    compileOptions {
+        compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
-//BlackObfuscator {
-//    enabled true
-//    obfClass = ["MainActivity", "com.bbb"]
-//}
+BlackObfuscator {
+    enabled true
+    obfClass = ["MainActivity", "com.bbb"]
+}
 
 dependencies {
 
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.2.0"
-//        classpath "top.niunaijun.blackobfuscator:plugin:1.0.0"
+        classpath "top.niunaijun.blackobfuscator:plugin:1.0.0"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.jar b/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.jar
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.jar.md5 b/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.jar.md5
@@ -1 +1 @@
-e9f5e0a50ced710f1157589541b6b3d8
+ed7bf432cc57babf03a25c5a0ff95abc
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.jar.sha1 b/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.jar.sha1
@@ -1 +1 @@
-4055cb450a96798f7aeddafce481cc9a4bfef2f5
+803f254bf5ef5711f0f6cf94f55b1237d3f8e7c8
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.pom b/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.pom
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.github.CodingGay.BlackObfuscator</groupId>
       <artifactId>dex-tools</artifactId>
-      <version>1.0.3</version>
+      <version>2.1</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.pom.md5 b/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.pom.md5
@@ -1 +1 @@
-58be27900eade6fbad79a9328c336ad6
+e072c183806d331aa32ac8863534a4ce
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.pom.sha1 b/localRepo/top/niunaijun/blackobfuscator/plugin/1.0.0/plugin-1.0.0.pom.sha1
@@ -1 +1 @@
-4d286fbaa7f641cab7e669d781b564c0db4cf0fd
+76b4be6ced264f6379d490e0d7331dd732df1641
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/maven-metadata.xml b/localRepo/top/niunaijun/blackobfuscator/plugin/maven-metadata.xml
@@ -7,6 +7,6 @@
     <versions>
       <version>1.0.0</version>
     </versions>
-    <lastUpdated>20211217154344</lastUpdated>
+    <lastUpdated>20220111141950</lastUpdated>
   </versioning>
 </metadata>
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/maven-metadata.xml.md5 b/localRepo/top/niunaijun/blackobfuscator/plugin/maven-metadata.xml.md5
@@ -1 +1 @@
-0316268e6b77e891d948dc5825c3a1e6
+ab00298c03962a3ffdc635a350badc08
diff --git a/localRepo/top/niunaijun/blackobfuscator/plugin/maven-metadata.xml.sha1 b/localRepo/top/niunaijun/blackobfuscator/plugin/maven-metadata.xml.sha1
@@ -1 +1 @@
-ca2f5e7cda07b160934e29f66d21ea7956350312
+5472636145974a6e10fa5af7b149bed773731c73
diff --git a/plugin/src/main/groovy/top/niunaijun/blackobfuscator/ObfPlugin.groovy b/plugin/src/main/groovy/top/niunaijun/blackobfuscator/ObfPlugin.groovy
@@ -61,16 +61,6 @@ public class ObfPlugin implements Plugin<Project> {
                         }
                     }
                 })
-                android.buildTypes.all(new Action<BuildType>() {
-                    @Override
-                    void execute(BuildType buildType) {
-                        def name = upperCaseFirst(buildType.name)
-                        def names = [buildType.name, name]
-                        for (String p : names) {
-                            addOtherTask(tasks, p)
-                        }
-                    }
-                })
                 android.productFlavors.all(new Action<ProductFlavor>() {
                     @Override
                     void execute(ProductFlavor productFlavor) {
@@ -95,14 +85,28 @@ public class ObfPlugin implements Plugin<Project> {
     private void addOtherTask(List<Task> tasks, String name) {
         addTask("mergeDex${name}Release", tasks)
         addTask("mergeDex${name}Debug", tasks)
+        addTask("mergeDex${name}", tasks)
+        addTask("mergeDexApp${name}", tasks)
+
         addTask("mergeLibDex${name}Debug", tasks)
+        addTask("mergeLibDex${name}", tasks)
+        addTask("mergeLibDexApp${name}", tasks)
         addTask("mergeProjectDex${name}Debug", tasks)
+        addTask("mergeProjectDex${name}", tasks)
+        addTask("mergeProjectDexApp${name}", tasks)
 
         addTask("transformDexArchiveWithDexMergerFor${name}Debug", tasks)
         addTask("transformDexArchiveWithDexMergerFor${name}Release", tasks)
+        addTask("transformDexArchiveWithDexMergerFor${name}", tasks)
+        addTask("transformDexArchiveWithDexMergerForApp${name}", tasks)
 
         addTask("minify${name}ReleaseWithR8", tasks)
+        addTask("minify${name}WithR8", tasks)
+        addTask("minifyApp${name}WithR8", tasks)
+
         addTask("minify${name}DebugWithR8", tasks)
+        addTask("minify${name}WithR8", tasks)
+        addTask("minifyApp${name}WithR8", tasks)
     }
 
     private String upperCaseFirst(String val) {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`	`}`
`11`	`11`	`dependencies {`
`12`	`12`	`classpath "com.android.tools.build:gradle:4.2.0"`
`13`		`-// classpath "top.niunaijun.blackobfuscator:plugin:1.0.0"`
	`13`	`+ classpath "top.niunaijun.blackobfuscator:plugin:1.0.0"`
`14`	`14`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`15`	`15`	`// NOTE: Do not place your application dependencies here; they belong`
`16`	`16`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e9f5e0a50ced710f1157589541b6b3d8`
	`1`	`+ed7bf432cc57babf03a25c5a0ff95abc`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4055cb450a96798f7aeddafce481cc9a4bfef2f5`
	`1`	`+803f254bf5ef5711f0f6cf94f55b1237d3f8e7c8`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-58be27900eade6fbad79a9328c336ad6`
	`1`	`+e072c183806d331aa32ac8863534a4ce`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4d286fbaa7f641cab7e669d781b564c0db4cf0fd`
	`1`	`+76b4be6ced264f6379d490e0d7331dd732df1641`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0316268e6b77e891d948dc5825c3a1e6`
	`1`	`+ab00298c03962a3ffdc635a350badc08`