Skip to content

Commit 72bdc62

Browse files
committed
signingConfigs added; lintConfig is now per module.
1 parent 092727c commit 72bdc62

File tree

6 files changed

+56
-11
lines changed

6 files changed

+56
-11
lines changed

.idea/runConfigurations/androidx_github_library__lint_.xml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ if (System.env.JITPACK) {
4747
project.ext.set('versionName', System.env.VERSION)
4848
}
4949

50+
/** Keystore Settings, loaded from keystore.properties */
51+
if (rootProject.file('keystore.properties').exists()) {
52+
def keystore = new Properties()
53+
keystore.load(new FileInputStream(rootProject.file('keystore.properties')))
54+
project.ext.set('debugKeystorePass', keystore['debugKeystorePass'])
55+
project.ext.set('debugKeyAlias', keystore['debugKeyAlias'])
56+
project.ext.set('debugKeyPass', keystore['debugKeyPass'])
57+
project.ext.set('releaseKeystorePass', keystore['releaseKeystorePass'])
58+
project.ext.set('releaseKeyAlias', keystore['releaseKeyAlias'])
59+
project.ext.set('releaseKeyPass', keystore['releaseKeyPass'])
60+
}
61+
5062
/** Build Configurations */
5163
project.ext.set('archiveBuildTypes', ['debug', 'release'])
5264

library/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ android {
4545
}
4646
}
4747

48-
lint {
49-
lintConfig rootProject.file('lint.xml')
50-
checkAllWarnings true
51-
warningsAsErrors true
52-
abortOnError false
53-
showAll false
54-
}
55-
5648
publishing {
5749
singleVariant('release') {
5850
withSourcesJar()
5951
withJavadocJar()
6052
}
6153
}
54+
55+
lint {
56+
lintConfig project.file('lint.xml')
57+
checkAllWarnings true
58+
warningsAsErrors true
59+
abortOnError false
60+
showAll false
61+
}
6262
}
6363

6464
dependencies {

library/lint.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lint>
3+
4+
</lint>

mobile/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,16 @@ android {
4343

4444
signingConfigs {
4545
debug {
46-
46+
storeFile new File("${System.properties['user.home']}${File.separator}.android${File.separator}debug.keystore")
47+
storePassword rootProject.ext.get('debugKeystorePass')
48+
keyAlias rootProject.ext.get('debugKeyAlias')
49+
keyPassword rootProject.ext.get('debugKeyPass')
4750
}
4851
release {
49-
52+
storeFile new File("${System.properties['user.home']}${File.separator}.android${File.separator}release.keystore")
53+
storePassword rootProject.ext.get('releaseKeystorePass')
54+
keyAlias rootProject.ext.get('releaseKeyAlias')
55+
keyPassword rootProject.ext.get('releaseKeyPass')
5056
}
5157
}
5258

@@ -83,7 +89,7 @@ android {
8389
}
8490

8591
lint {
86-
lintConfig rootProject.file('lint.xml')
92+
lintConfig project.file('lint.xml')
8793
checkAllWarnings true
8894
warningsAsErrors true
8995
abortOnError false
File renamed without changes.

0 commit comments

Comments
 (0)