add 尝试修复log4j问题

youlookwhat · Jan 24, 2022 · cfc5c1e · cfc5c1e
1 parent 017512e
commit cfc5c1e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,8 +52,6 @@ captures/
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild

diff --git a/app/build.gradle b/app/build.gradle
@@ -17,21 +17,46 @@ android {
         versionName "1.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        ndk {
+            abiFilters 'armeabi-v7a', "x86"
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    //签名 其他smb
+    signingConfigs {
+        release {
+            storeFile file("./bysmb.jks")
+            storePassword "bysmb2022"
+            keyAlias "bysmb"
+            keyPassword "bysmb2022"
+        }
+    }
+    buildTypes {
+        release {
+            // 混淆
+            minifyEnabled false
+            // Zipalign优化
+            zipAlignEnabled false
+            // 移除无用的resource文件
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+
+        debug {
+            signingConfig signingConfigs.release
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {

diff --git a/app/bysmb.jks b/app/bysmb.jks
diff --git a/smb/build.gradle b/smb/build.gradle
@@ -8,8 +8,8 @@ apply plugin: 'maven'
 group = 'com.github.youlookwhat'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
@@ -18,12 +18,15 @@ dependencies {
 
     // 读取及写入网络共享文件
     api group: 'com.hierynomus', name: 'smbj', version: '0.10.0'
-    api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
-    api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
+    api group: 'com.hierynomus', name: 'asn-one', version: '0.5.0'
+    api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha6'
+    api group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.0-alpha6'
+    api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
     api group: 'net.engio', name: 'mbassador', version: '1.3.0'
-    api group: 'com.hierynomus', name: 'asn-one', version: '0.4.0'
 //    api group: 'org.apache.cassandra', name: 'cassandra-all', version: '0.8.1'
 //    api group: 'org.slf4j', name: 'slf4j-simple', version: '1.6.4'
 
-    api group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.32'
+//    api 'com.github.youlookwhat:smbj:0.20.0'
+//    api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
+//    api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
 }