From 6f0f2fdeda2a6638698293a5fd01b251e99b23bf Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Fri, 7 Aug 2020 21:28:00 -0400 Subject: [PATCH] Sanitize project configuration Make project compilable out of box. This commit address the following: - remove release key - fix gitignore for Android Studio temp files - add gradle wrapper properties --- .gitignore | 8 +++----- V2rayNG/app/build.gradle | 19 +------------------ .../gradle/wrapper/gradle-wrapper.properties | 6 ++++++ 3 files changed, 10 insertions(+), 23 deletions(-) create mode 100644 V2rayNG/gradle/wrapper/gradle-wrapper.properties diff --git a/.gitignore b/.gitignore index ca9dfff2..7c701c49 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,8 @@ V2rayNG/app/src/main/res/layout/activity_inapp_buy.xml V2rayNG/app/src/main/assets/geoip.dat V2rayNG/app/src/main/assets/geosite.dat V2rayNG/app/src/main/java/com/v2ray/ang/InappBuyActivity.java -V2rayNG/gradle/wrapper/gradle-wrapper.properties -V2rayNG/gradle/wrapper/gradle-wrapper.properties *.dat *.jks -V2rayNG/gradle/wrapper/gradle-wrapper.properties -V2rayNG/gradle/wrapper/gradle-wrapper.properties -V2rayNG/app/release/output.json \ No newline at end of file +V2rayNG/app/release/output.json +.idea/ +.gradle/ \ No newline at end of file diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 06356c83..b9589f12 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -20,34 +20,17 @@ android { versionName "1.0.2" } - signingConfigs { - release { - storeFile file("../key.jks") - keyAlias 'ang' - keyPassword '123456' - storePassword '123456' - } - debug { - storeFile file("../key.jks") - keyAlias 'ang' - keyPassword '123456' - storePassword '123456' - } - } - buildTypes { release { minifyEnabled false zipAlignEnabled false shrinkResources false - signingConfig signingConfigs.release // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } debug { minifyEnabled false zipAlignEnabled false shrinkResources false - signingConfig signingConfigs.release } } @@ -131,4 +114,4 @@ repositories { flatDir { dirs 'libs' } -} \ No newline at end of file +} diff --git a/V2rayNG/gradle/wrapper/gradle-wrapper.properties b/V2rayNG/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..845192ee --- /dev/null +++ b/V2rayNG/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Feb 25 12:40:41 CST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip