Skip to content

Commit ca63e7c

Browse files
authored
Forma Android v0.1.0 (#129)
1 parent 26fb981 commit ca63e7c

File tree

3 files changed

+3
-43
lines changed

3 files changed

+3
-43
lines changed

plugins/android/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
group = "tools.forma"
11-
version = "0.0.1"
11+
version = "0.1.0"
1212

1313
tasks.named("compileKotlin", KotlinCompilationTask::class.java) {
1414
compilerOptions {
@@ -37,10 +37,8 @@ gradlePlugin {
3737
implementationClass = "tools.forma.android.plugin.FormaPlugin"
3838
tags.set(
3939
listOf(
40-
"gradle",
4140
"kotlin",
4241
"android",
43-
"plugin",
4442
"structure",
4543
"dependencies",
4644
"module",

plugins/build.gradle.kts

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,9 @@
1-
import com.gradle.publish.PublishPlugin
2-
31
plugins {
42
`kotlin-dsl`
5-
id("com.gradle.plugin-publish") version "1.1.0" apply false
3+
id("com.gradle.plugin-publish") version "1.2.0" apply false
64
}
75

86
class FormaRootConfigurationException(
97
override val message: String,
108
override val cause: Throwable? = null
119
) : Exception()
12-
13-
subprojects {
14-
plugins.whenPluginAdded {
15-
when (this) {
16-
is PublishPlugin -> registerPublishingTasks()
17-
}
18-
}
19-
}
20-
21-
fun Project.registerPublishingTasks() {
22-
/**
23-
* Workaround from https://github.com/gradle/gradle/issues/1246
24-
*/
25-
val pluginPublishKeysSetup = tasks.register("pluginPublishKeysSetup") {
26-
doLast {
27-
val key = System.getenv("GRADLE_PUBLISH_KEY")
28-
val secret = System.getenv("GRADLE_PUBLISH_SECRET")
29-
30-
if (key == null || secret == null) throw GradleException(
31-
"gradlePublishKey and/or gradlePublishSecret are not defined environment variables"
32-
)
33-
34-
System.setProperty("gradle.publish.key", key)
35-
System.setProperty("gradle.publish.secret", secret)
36-
}
37-
}
38-
39-
tasks.named("publishPlugins").configure {
40-
dependsOn(pluginPublishKeysSetup)
41-
}
42-
}
43-
44-
45-
tasks.register("publishPluginsToMavenLocal") {
46-
dependsOn(subprojects.map { "${it.path}:publishToMavenLocal" })
47-
}

plugins/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ pluginManagement {
44

55
plugins {
66
id("convention-dependencies")
7-
id("tools.forma.includer") version "0.1.3"
7+
id("tools.forma.includer") version "0.2.0"
88
}

0 commit comments

Comments
 (0)