diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 3cc336b..88ea3aa 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,22 +1,6 @@ - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 8fa2446..86e60b3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index ca0f8d1..11192d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'AndResGuard' android { compileSdkVersion 31 @@ -12,7 +11,7 @@ android { minSdkVersion 23 targetSdkVersion 31 versionCode 12 - versionName '1.4.1' + versionName '1.4.2' resConfigs "zh", "zh-rCN" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -62,54 +61,6 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.code.gson:gson:2.8.9' //implementation 'com.liaoinstan.springview:library:1.7.0' } - -andResGuard { - // mappingFile = file("./resource_mapping.txt") - mappingFile = null - use7zip = true - useSign = true - // 打开这个开关,会keep住所有资源的原始路径,只混淆资源的名字 - keepRoot = false - // 设置这个值,会把arsc name列混淆成相同的名字,减少string常量池的大小 - fixedResName = "arg" - // 打开这个开关会合并所有哈希值相同的资源,但请不要过度依赖这个功能去除去冗余资源 - mergeDuplicatedRes = true - whiteList = [ - // for your icon - "R.drawable.icon", - // for fabric - "R.string.com.crashlytics.*", - // for google-services - "R.string.google_app_id", - "R.string.gcm_defaultSenderId", - "R.string.default_web_client_id", - "R.string.ga_trackingId", - "R.string.firebase_database_url", - "R.string.google_api_key", - "R.string.google_crash_reporting_api_key" - ] - compressFilePattern = [ - "*.png", - "*.jpg", - "*.jpeg", - "*.gif", - ] - sevenzip { - //artifact = 'com.tencent.mm:SevenZip:1.2.21' - path = "7za" - } - - /** - * 可选: 如果不设置则会默认覆盖assemble输出的apk - **/ - // finalApkBackupPath = "${project.rootDir}/final.apk" - - /** - * 可选: 指定v1签名时生成jar文件的摘要算法 - * 默认值为“SHA-1” - **/ - // digestalg = "SHA-256" -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index e583165..24c5744 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.21' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files