From cfc5c1e1b986a31580f1fb489ce8a20c67505b97 Mon Sep 17 00:00:00 2001 From: jngbin <770413277@qq.com> Date: Mon, 24 Jan 2022 18:16:17 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8Dlog4j?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 -- app/build.gradle | 37 +++++++++++++++++++++++++++++++------ app/bysmb.jks | Bin 0 -> 2605 bytes smb/build.gradle | 15 +++++++++------ 4 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 app/bysmb.jks diff --git a/.gitignore b/.gitignore index 56cc642..a5924c4 100644 --- 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 index 0d2533c..2ee553d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,14 +17,11 @@ 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 @@ -32,6 +29,34 @@ android { 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 new file mode 100644 index 0000000000000000000000000000000000000000..52c2dab4d68581a31308bacda02eb80f2b1069bb GIT binary patch literal 2605 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 literal 0 HcmV?d00001 diff --git a/smb/build.gradle b/smb/build.gradle index 1431ad4..0aeba19 100644 --- 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' } \ No newline at end of file