Skip to content

Commit bf9d1a7

Browse files
committed
Merge branch 'compose-1.1.1-kotlin-1.6.10' into main
2 parents e80457c + 8a81285 commit bf9d1a7

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val projectVersion = "0.1.0-compose-1.2.0-alpha01-dev748-SNAPSHOT"
1+
const val projectVersion = "0.1.0-compose-1.2.0-alpha01-dev748-SNAPSHOT"
22

33
object DependencyVersions {
44
val webcomponents = "2.6.0"

gradle-plugins/build.gradle.kts

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import com.huanshankeji.SourceFile
2+
import com.huanshankeji.generateKotlinSources
3+
14
plugins {
25
`kotlin-dsl`
36
id("com.gradle.plugin-publish") version "1.0.0-rc-2"
@@ -12,20 +15,14 @@ dependencies {
1215
}
1316

1417

15-
val generateVersion = "generateVersion"
16-
val generatedSourcesDir = buildDir.resolve("gen/main/kotlin")
17-
18-
tasks.register(generateVersion) {
19-
generatedSourcesDir.mkdirs()
20-
val generatedVersionsSourceFile = generatedSourcesDir.resolve("GeneratedVersions.kt")
21-
generatedVersionsSourceFile.writeText("const val projectVersion = \"$projectVersion\"\n")
22-
}
23-
24-
tasks.compileKotlin {
25-
dependsOn(generateVersion)
26-
}
27-
28-
kotlin.sourceSets["main"].kotlin.srcDir(generatedSourcesDir)
18+
generateKotlinSources(
19+
sourceFiles = listOf(
20+
SourceFile(
21+
"GeneratedVersions.kt",
22+
"const val projectVersion = \"$projectVersion\"\n"
23+
)
24+
)
25+
)
2926

3027

3128
group = "com.huanshankeji"

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ buildscript {
1212
}
1313
dependencies {
1414
classpath(kotlin("gradle-plugin", "1.7.0"))
15-
classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.1.5-kotlin-1.6.10")
15+
classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.1.8-kotlin-1.6.10")
1616
}
1717
}

0 commit comments

Comments
 (0)