Skip to content

Commit 9da2eac

Browse files
authored
Merge pull request #6 from uncinc/feature/separate-signing-functions
Feature/separate signing functions
2 parents 90c2f96 + 7a33bed commit 9da2eac

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

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

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55
}
66

77
group 'nl.uncinc.androidci'
8-
version '0.3'
9-
sourceCompatibility = 1.8
8+
version '0.4'
9+
sourceCompatibility = 1.11
1010

1111
repositories {
1212
mavenCentral()
@@ -26,7 +26,7 @@ gradlePlugin {
2626
dependencies {
2727
compile gradleApi()
2828
compile localGroovy()
29-
compile "com.android.tools.build:gradle:3.5.3"
29+
compile "com.android.tools.build:gradle:7.4.0"
3030
testCompile group: 'junit', name: 'junit', version: '4.12'
3131
}
3232

@@ -55,4 +55,4 @@ bintray {
5555
vcsTag = '0.3'
5656
}
5757
}
58-
}
58+
}

src/main/groovy/nl/uncinc/androidci/UncIncAndroidCIPlugin.groovy

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package nl.uncinc.androidci
22

3-
import com.android.build.gradle.internal.dsl.SigningConfig
3+
import com.android.build.api.variant.impl.SigningConfigImpl
4+
import com.android.builder.model.SigningConfig
45
import org.gradle.api.Plugin
56
import org.gradle.api.Project
67

@@ -68,14 +69,30 @@ class UncIncAndroidCIPlugin implements Plugin<Project> {
6869
}
6970

7071
SigningConfig getSigningConfig() {
71-
def signingConfig = new SigningConfig("CIStore")
72+
def signingConfig = new SigningConfigImpl("CIStore")
7273
signingConfig.storeFile = project.file(androidci.keystoreProperties['storeFile'])
7374
signingConfig.storePassword = androidci.keystoreProperties['storePassword']
7475
signingConfig.keyAlias = androidci.keystoreProperties['keyAlias']
7576
signingConfig.keyPassword = androidci.keystoreProperties['keyPassword']
7677
return signingConfig
7778
}
7879

80+
File getStoreFile() {
81+
return project.file(androidci.keystoreProperties['storeFile'])
82+
}
83+
84+
String getStorePassword() {
85+
return androidci.keystoreProperties['storePassword']
86+
}
87+
88+
String getKeyAlias() {
89+
return androidci.keystoreProperties['keyAlias']
90+
}
91+
92+
String getKeyPassword() {
93+
return androidci.keystoreProperties['keyPassword']
94+
}
95+
7996
String getGitHash() {
8097
def stdout = new ByteArrayOutputStream()
8198
project.exec {
@@ -84,4 +101,4 @@ class UncIncAndroidCIPlugin implements Plugin<Project> {
84101
}
85102
return stdout.toString().trim()
86103
}
87-
}
104+
}

0 commit comments

Comments
 (0)