diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..19dd4d8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "keystore"] + path = keystore + url = https://github.com/fengyuecanzhu/Key.git diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 5cd7f7f..0000000 Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml new file mode 100644 index 0000000..a8fcc84 --- /dev/null +++ b/.idea/markdown-navigator-enh.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 0000000..a2fc086 --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..37b4af8 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index dbdf47a..9d9dfea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,6 +49,14 @@ def getVersionName(){ def versionN = getVersionName() +// 读取keystore.properties +def keyProps = new Properties() +def keyPropsFile = rootProject.file('keystore/keystore.properties') +if (keyPropsFile.exists()) { + keyProps.load(new FileInputStream(keyPropsFile)) +} + + android { compileSdkVersion 29 buildToolsVersion '29.0.3' @@ -60,7 +68,16 @@ android { versionName versionN testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - + + signingConfigs { + myConifg { + keyAlias keyProps['keyAlias'] + keyPassword keyProps['keyPassword'] + storeFile keyProps['storeFile'] ? file(keyProps['storeFile']) : null + storePassword keyProps['storePassword'] + } + } + buildFeatures { viewBinding true } @@ -72,12 +89,15 @@ android { ndk { abiFilters "x86", "armeabi", "armeabi-v7a" } + signingConfig signingConfigs.myConifg } debug { ndk { abiFilters "x86", "armeabi", "armeabi-v7a" } + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.myConifg } android.applicationVariants.all { variant -> variant.outputs.all { diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/keystore b/keystore new file mode 160000 index 0000000..d46d54c --- /dev/null +++ b/keystore @@ -0,0 +1 @@ +Subproject commit d46d54c2573c77713809f1061aef135c305bc9f4