Skip to content
Snippets Groups Projects
Verified Commit 7b9a9b1d authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

fix: correct signing configuration

parent c5b976a0
Branches
No related tags found
No related merge requests found
Pipeline #2995 failed
...@@ -32,6 +32,10 @@ gradlePlugin { ...@@ -32,6 +32,10 @@ gradlePlugin {
id = "justjanne.kotlin" id = "justjanne.kotlin"
implementationClass = "KotlinConvention" implementationClass = "KotlinConvention"
} }
register("signing") {
id = "justjanne.signing"
implementationClass = "SigningConvention"
}
} }
} }
......
...@@ -4,7 +4,6 @@ import org.gradle.api.Plugin ...@@ -4,7 +4,6 @@ import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import util.git import util.git
import util.properties
import java.util.Locale import java.util.Locale
class AndroidApplicationConvention : Plugin<Project> { class AndroidApplicationConvention : Plugin<Project> {
...@@ -13,6 +12,7 @@ class AndroidApplicationConvention : Plugin<Project> { ...@@ -13,6 +12,7 @@ class AndroidApplicationConvention : Plugin<Project> {
with(pluginManager) { with(pluginManager) {
apply("com.android.application") apply("com.android.application")
apply("justjanne.kotlin.android") apply("justjanne.kotlin.android")
apply("justjanne.signing")
} }
extensions.configure<ApplicationExtension> { extensions.configure<ApplicationExtension> {
...@@ -49,17 +49,6 @@ class AndroidApplicationConvention : Plugin<Project> { ...@@ -49,17 +49,6 @@ class AndroidApplicationConvention : Plugin<Project> {
buildConfig = true buildConfig = true
} }
signingConfigs {
SigningData.of(project.rootProject.properties("signing.properties"))?.let {
create("default") {
storeFile = file(it.storeFile)
storePassword = it.storePassword
keyAlias = it.keyAlias
keyPassword = it.keyPassword
}
}
}
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11
......
import com.android.build.api.dsl.ApplicationExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import util.properties
class SigningConvention : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
apply("com.android.application")
apply("justjanne.kotlin.android")
}
extensions.configure<ApplicationExtension> {
signingConfigs {
SigningData.of(rootProject.properties("signing.properties"))?.let {
create("default") {
storeFile = file(it.storeFile)
storePassword = it.storePassword
keyAlias = it.keyAlias
keyPassword = it.keyPassword
}
}
}
}
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment