Skip to content

Commit 5582a04

Browse files
ForteScarletForteScarlet
committed
v0.6.0-beta4
1 parent 612fe44 commit 5582a04

File tree

7 files changed

+83
-44
lines changed

7 files changed

+83
-44
lines changed

‎buildSrc/src/main/kotlin/IProject.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import love.forte.gradle.common.core.project.ProjectDetail
22
import love.forte.gradle.common.core.project.Version
3+
import love.forte.gradle.common.core.project.minus
34
import love.forte.gradle.common.core.project.version
45

56
object IProject : ProjectDetail() {
@@ -8,7 +9,7 @@ object IProject : ProjectDetail() {
89
const val DESCRIPTION = "Generate platform-compatible functions for Kotlin suspend functions"
910
const val HOMEPAGE = "https://github.com/ForteScarlet/kotlin-suspend-transform-compiler-plugin"
1011

11-
override val version: Version = version(0, 6, 0)
12+
override val version: Version = version(0, 6, 0) - version("beta4")
1213

1314
override val homepage: String get() = HOMEPAGE
1415

‎compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/SuspendTransformCommandLineProcessor.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package love.forte.plugin.suspendtrans
22

3-
import BuildConfig
43
import com.google.auto.service.AutoService
54
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
65
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
@@ -17,7 +16,7 @@ class SuspendTransformCommandLineProcessor : CommandLineProcessor {
1716
CompilerConfigurationKey.create(CliOptions.CONFIGURATION)
1817
}
1918

20-
override val pluginId: String = BuildConfig.KOTLIN_PLUGIN_ID
19+
override val pluginId: String = SuspendTransPluginConstants.KOTLIN_PLUGIN_ID
2120

2221
override val pluginOptions: Collection<SimpleCliOption> = CliOptions.allOptions.map { it as SimpleCliOption }
2322

‎plugins/suspend-transform-plugin-gradle/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ dependencies {
3434
}
3535

3636
buildConfig {
37+
className("SuspendTransPluginConstants")
3738
useKotlinOutput {
38-
internalVisibility = true
39+
internalVisibility = false
3940
}
40-
withoutPackage()
41+
packageName("love.forte.plugin.suspendtrans.gradle")
4142

4243
val project = project(":compiler:suspend-transform-plugin-embeddable")
4344
buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"${rootProject.extra["kotlin_plugin_id"]}\"")

‎plugins/suspend-transform-plugin-gradle/src/main/kotlin/BuildConfig.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import love.forte.plugin.suspendtrans.gradle.SuspendTransPluginConstants
2+
3+
@Deprecated(
4+
"Use SuspendTransPluginConstants",
5+
ReplaceWith(
6+
"SuspendTransPluginConstants",
7+
imports = ["love.forte.plugin.suspendtrans.gradle.SuspendTransPluginConstants"]
8+
)
9+
)
10+
internal object BuildConfig {
11+
internal const val KOTLIN_PLUGIN_ID: String = SuspendTransPluginConstants.KOTLIN_PLUGIN_ID
12+
13+
internal const val PLUGIN_VERSION: String = SuspendTransPluginConstants.PLUGIN_VERSION
14+
15+
internal const val KOTLIN_PLUGIN_GROUP: String = SuspendTransPluginConstants.KOTLIN_PLUGIN_GROUP
16+
17+
internal const val KOTLIN_PLUGIN_NAME: String = SuspendTransPluginConstants.KOTLIN_PLUGIN_NAME
18+
19+
internal const val KOTLIN_PLUGIN_VERSION: String = SuspendTransPluginConstants.KOTLIN_PLUGIN_VERSION
20+
21+
internal const val ANNOTATION_GROUP: String = SuspendTransPluginConstants.ANNOTATION_GROUP
22+
23+
internal const val ANNOTATION_NAME: String = SuspendTransPluginConstants.ANNOTATION_NAME
24+
25+
internal const val ANNOTATION_VERSION: String = SuspendTransPluginConstants.ANNOTATION_VERSION
26+
27+
internal const val RUNTIME_GROUP: String = SuspendTransPluginConstants.RUNTIME_GROUP
28+
29+
internal const val RUNTIME_NAME: String = SuspendTransPluginConstants.RUNTIME_NAME
30+
31+
internal const val RUNTIME_VERSION: String = SuspendTransPluginConstants.RUNTIME_VERSION
32+
}

‎plugins/suspend-transform-plugin-gradle/src/main/kotlin/love/forte/plugin/suspendtrans/gradle/DSL.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
package love.forte.plugin.suspendtrans.gradle
44

5-
import BuildConfig.KOTLIN_PLUGIN_ID
6-
import BuildConfig.PLUGIN_VERSION
5+
import love.forte.plugin.suspendtrans.gradle.SuspendTransPluginConstants.KOTLIN_PLUGIN_ID
6+
import love.forte.plugin.suspendtrans.gradle.SuspendTransPluginConstants.PLUGIN_VERSION
77

88

99
val org.gradle.plugin.use.PluginDependenciesSpec.`suspend-transform`: org.gradle.plugin.use.PluginDependencySpec

‎plugins/suspend-transform-plugin-gradle/src/main/kotlin/love/forte/plugin/suspendtrans/gradle/SuspendTransformGradleExtension.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package love.forte.plugin.suspendtrans.gradle
22

3-
import BuildConfig
43
import love.forte.plugin.suspendtrans.SuspendTransformConfiguration
54

65

@@ -15,7 +14,7 @@ open class SuspendTransformGradleExtension : SuspendTransformConfiguration() {
1514
*/
1615
var includeAnnotation: Boolean = true
1716

18-
var annotationDependencyVersion: String = BuildConfig.ANNOTATION_VERSION
17+
var annotationDependencyVersion: String = SuspendTransPluginConstants.ANNOTATION_VERSION
1918

2019
/**
2120
* 当 [includeAnnotation] 为 true 时，配置runtime环境的依赖方式。默认为 `compileOnly` （在JVM中） 。
@@ -27,7 +26,7 @@ open class SuspendTransformGradleExtension : SuspendTransformConfiguration() {
2726
*/
2827
var includeRuntime: Boolean = true
2928

30-
var runtimeDependencyVersion: String = BuildConfig.RUNTIME_VERSION
29+
var runtimeDependencyVersion: String = SuspendTransPluginConstants.RUNTIME_VERSION
3130

3231
/**
3332
* 当 [includeRuntime] 为 true 时，配置runtime环境的依赖方式。默认为 `implementation` （在JVM中）。

‎plugins/suspend-transform-plugin-gradle/src/main/kotlin/love/forte/plugin/suspendtrans/gradle/SuspendTransformGradlePlugin.kt‎

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package love.forte.plugin.suspendtrans.gradle
22

3-
import BuildConfig
43
import love.forte.plugin.suspendtrans.CliOptions
54
import org.gradle.api.Project
65
import org.gradle.api.provider.Provider
@@ -22,13 +21,13 @@ open class SuspendTransformGradlePlugin : KotlinCompilerPluginSupportPlugin {
2221
return kotlinCompilation.target.project.plugins.hasPlugin(SuspendTransformGradlePlugin::class.java)
2322
}
2423

25-
override fun getCompilerPluginId(): String = BuildConfig.KOTLIN_PLUGIN_ID
24+
override fun getCompilerPluginId(): String = SuspendTransPluginConstants.KOTLIN_PLUGIN_ID
2625

2726
override fun getPluginArtifact(): SubpluginArtifact {
2827
return SubpluginArtifact(
29-
groupId = BuildConfig.KOTLIN_PLUGIN_GROUP,
30-
artifactId = BuildConfig.KOTLIN_PLUGIN_NAME,
31-
version = BuildConfig.KOTLIN_PLUGIN_VERSION
28+
groupId = SuspendTransPluginConstants.KOTLIN_PLUGIN_GROUP,
29+
artifactId = SuspendTransPluginConstants.KOTLIN_PLUGIN_NAME,
30+
version = SuspendTransPluginConstants.KOTLIN_PLUGIN_VERSION
3231
)
3332
}
3433

@@ -42,12 +41,12 @@ open class SuspendTransformGradlePlugin : KotlinCompilerPluginSupportPlugin {
4241
// val dependencies = project.dependencies
4342
// dependencies.add(
4443
// "compileOnly",
45-
// "${BuildConfig.ANNOTATION_GROUP}:${BuildConfig.ANNOTATION_NAME}:${BuildConfig.ANNOTATION_VERSION}"
44+
// "${SuspendTransPluginConstants.ANNOTATION_GROUP}:${SuspendTransPluginConstants.ANNOTATION_NAME}:${SuspendTransPluginConstants.ANNOTATION_VERSION}"
4645
// )
4746
// if (extension.includeRuntime) {
4847
// dependencies.add(
4948
// extension.runtimeConfigurationName,
50-
// "${BuildConfig.RUNTIME_GROUP}:${BuildConfig.RUNTIME_NAME}:${BuildConfig.RUNTIME_VERSION}"
49+
// "${SuspendTransPluginConstants.RUNTIME_GROUP}:${SuspendTransPluginConstants.RUNTIME_NAME}:${SuspendTransPluginConstants.RUNTIME_VERSION}"
5150
// )
5251
// }
5352

@@ -71,18 +70,23 @@ private fun Project.configureDependencies() {
7170
fun Project.include(platform: Platform, conf: SuspendTransformGradleExtension) {
7271
if (conf.includeAnnotation) {
7372
val notation = getDependencyNotation(
74-
BuildConfig.ANNOTATION_GROUP,
75-
BuildConfig.ANNOTATION_NAME,
73+
SuspendTransPluginConstants.ANNOTATION_GROUP,
74+
SuspendTransPluginConstants.ANNOTATION_NAME,
7675
platform,
7776
conf.annotationDependencyVersion
7877
)
79-
dependencies.add(conf.annotationConfigurationName, notation)
78+
if (platform == Platform.JVM) {
79+
dependencies.add(conf.annotationConfigurationName, notation)
80+
} else {
81+
// JS, native 似乎不支持其他的 name，例如 compileOnly
82+
dependencies.add("implementation", notation)
83+
}
8084
dependencies.add("testImplementation", notation)
8185
}
8286
if (conf.includeRuntime) {
8387
val notation = getDependencyNotation(
84-
BuildConfig.RUNTIME_GROUP,
85-
BuildConfig.RUNTIME_NAME,
88+
SuspendTransPluginConstants.RUNTIME_GROUP,
89+
SuspendTransPluginConstants.RUNTIME_NAME,
8690
platform,
8791
conf.runtimeDependencyVersion
8892
)
@@ -129,45 +133,48 @@ fun Project.withPluginWhenEvaluatedConf(
129133

130134
fun Project.configureMultiplatformDependency(conf: SuspendTransformGradleExtension) {
131135
if (rootProject.getBooleanProperty("kotlin.mpp.enableGranularSourceSetsMetadata")) {
132-
val mainSourceSets = project.extensions.getByType(KotlinMultiplatformExtension::class.java).sourceSets
133-
.getByName(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME)
134-
val testSourceSets = project.extensions.getByType(KotlinMultiplatformExtension::class.java).sourceSets
135-
.getByName(KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME)
136+
val multiplatformExtensions = project.extensions.getByType(KotlinMultiplatformExtension::class.java)
136137

138+
val commonMainSourceSets =
139+
multiplatformExtensions.sourceSets.getByName(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME)
140+
val commonTestSourceSets =
141+
multiplatformExtensions.sourceSets.getByName(KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME)
137142

138143
if (conf.includeAnnotation) {
139144
val notation = getDependencyNotation(
140-
BuildConfig.ANNOTATION_GROUP,
141-
BuildConfig.ANNOTATION_NAME,
145+
SuspendTransPluginConstants.ANNOTATION_GROUP,
146+
SuspendTransPluginConstants.ANNOTATION_NAME,
142147
Platform.MULTIPLATFORM,
143148
conf.annotationDependencyVersion
144149
)
145-
dependencies.add(mainSourceSets.compileOnlyConfigurationName, notation)
146-
dependencies.add(testSourceSets.implementationConfigurationName, notation)
150+
dependencies.add(commonMainSourceSets.compileOnlyConfigurationName, notation)
151+
dependencies.add(commonTestSourceSets.implementationConfigurationName, notation)
147152
}
148153

149154
if (conf.includeRuntime) {
150155
val notation = getDependencyNotation(
151-
BuildConfig.RUNTIME_GROUP,
152-
BuildConfig.RUNTIME_NAME,
156+
SuspendTransPluginConstants.RUNTIME_GROUP,
157+
SuspendTransPluginConstants.RUNTIME_NAME,
153158
Platform.MULTIPLATFORM,
154159
conf.annotationDependencyVersion
155160
)
156-
dependencies.add(mainSourceSets.implementationConfigurationName, notation)
157-
dependencies.add(testSourceSets.implementationConfigurationName, notation)
161+
dependencies.add(commonMainSourceSets.implementationConfigurationName, notation)
162+
dependencies.add(commonTestSourceSets.implementationConfigurationName, notation)
158163
}
159164

160165
// For each source set that is only used in Native compilations, add an implementation dependency so that it
161166
// gets published and is properly consumed as a transitive dependency:
162167
sourceSetsByCompilation().forEach { (sourceSet, compilations) ->
163-
val isSharedNativeSourceSet = compilations.all {
168+
val isSharedSourceSet = compilations.all {
164169
it.platformType == KotlinPlatformType.common || it.platformType == KotlinPlatformType.native
170+
|| it.platformType == KotlinPlatformType.js || it.platformType == KotlinPlatformType.wasm
165171
}
166-
if (isSharedNativeSourceSet) {
172+
173+
if (isSharedSourceSet) {
167174
if (conf.includeAnnotation) {
168175
val notation = getDependencyNotation(
169-
BuildConfig.ANNOTATION_GROUP,
170-
BuildConfig.ANNOTATION_NAME,
176+
SuspendTransPluginConstants.ANNOTATION_GROUP,
177+
SuspendTransPluginConstants.ANNOTATION_NAME,
171178
Platform.MULTIPLATFORM,
172179
conf.annotationDependencyVersion
173180
)
@@ -177,8 +184,8 @@ fun Project.configureMultiplatformDependency(conf: SuspendTransformGradleExtensi
177184

178185
if (conf.includeRuntime) {
179186
val notation = getDependencyNotation(
180-
BuildConfig.RUNTIME_GROUP,
181-
BuildConfig.RUNTIME_NAME,
187+
SuspendTransPluginConstants.RUNTIME_GROUP,
188+
SuspendTransPluginConstants.RUNTIME_NAME,
182189
Platform.MULTIPLATFORM,
183190
conf.annotationDependencyVersion
184191
)
@@ -215,8 +222,8 @@ fun Project.configureMultiplatformDependency(conf: SuspendTransformGradleExtensi
215222
}
216223

217224
val notation = getDependencyNotation(
218-
BuildConfig.ANNOTATION_GROUP,
219-
BuildConfig.ANNOTATION_NAME,
225+
SuspendTransPluginConstants.ANNOTATION_GROUP,
226+
SuspendTransPluginConstants.ANNOTATION_NAME,
220227
platform,
221228
conf.annotationDependencyVersion
222229
)
@@ -227,8 +234,8 @@ fun Project.configureMultiplatformDependency(conf: SuspendTransformGradleExtensi
227234
val configurationName = sourceSet.implementationConfigurationName
228235

229236
val notation = getDependencyNotation(
230-
BuildConfig.RUNTIME_GROUP,
231-
BuildConfig.RUNTIME_NAME,
237+
SuspendTransPluginConstants.RUNTIME_GROUP,
238+
SuspendTransPluginConstants.RUNTIME_NAME,
232239
platform,
233240
conf.runtimeDependencyVersion
234241
)

0 commit comments

Comments
 (0)