Skip to content

Commit f2a458f

Browse files
committed
Enable v2 signature for foss flavor
1 parent 5af022e commit f2a458f

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Apr 04 23:24:54 CST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

xkcd/build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,6 @@ android {
9696
keyPassword project.hasProperty("ALIAS_PASS") ? ALIAS_PASS : (System.getenv("ALIAS_PASS") ? System.getenv("ALIAS_PASS") : properties.getProperty("ALIAS_PASS"))
9797
}
9898
}
99-
releaseFossConfig {
100-
File key = file("../key.jks")
101-
if (key.exists()) {
102-
storeFile key
103-
Properties properties = new Properties()
104-
File localProperty = file('../local.properties')
105-
if (localProperty.exists())
106-
properties.load(localProperty.newDataInputStream())
107-
storePassword project.hasProperty("KEYSTORE_PASS") ? KEYSTORE_PASS : (System.getenv("KEYSTORE_PASS") ? System.getenv("KEYSTORE_PASS") : properties.getProperty("KEYSTORE_PASS"))
108-
keyAlias project.hasProperty("ALIAS_NAME") ? ALIAS_NAME : (System.getenv("ALIAS_NAME") ? System.getenv("ALIAS_NAME") : properties.getProperty("ALIAS_NAME"))
109-
keyPassword project.hasProperty("ALIAS_PASS") ? ALIAS_PASS : (System.getenv("ALIAS_PASS") ? System.getenv("ALIAS_PASS") : properties.getProperty("ALIAS_PASS"))
110-
}
111-
v2SigningEnabled false
112-
}
11399
}
114100

115101
buildTypes {
@@ -136,9 +122,6 @@ android {
136122
if ("true" != System.getenv('CI')) {
137123
if (isProprietary) {
138124
signingConfig signingConfigs.releaseConfig
139-
} else {
140-
signingConfig signingConfigs.releaseFossConfig
141-
// https://gitlab.com/fdroid/fdroidserver/issues/697#note_229584776
142125
}
143126
}
144127
multiDexEnabled false

0 commit comments

Comments
 (0)