Skip to content

Commit b2b86fb

Browse files
committed
Test Ksp plugin
1 parent 58f9da3 commit b2b86fb

File tree

9 files changed

+11
-36
lines changed

9 files changed

+11
-36
lines changed

example/AndroidOnlyExample/app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
22
id("com.android.application")
33
id("org.jetbrains.kotlin.android")
4-
id("com.google.devtools.ksp") version "1.9.23-1.0.20"
5-
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23"
6-
id("de.jensklingenberg.ktorfit") version "2.0.0-2.0.0-SNAPSHOT"
4+
id("com.google.devtools.ksp") version "2.0.0-RC3-1.0.20"
5+
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
6+
id("de.jensklingenberg.ktorfit") version "2.0.0-SNAPSHOT"
77
}
88

99

example/AndroidOnlyExample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
plugins {
33
id 'com.android.application' version '8.0.2' apply false
44
id 'com.android.library' version '8.0.2' apply false
5-
id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
5+
id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
66
}

example/MultiplatformExample/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC3")
12+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
1313
classpath("com.android.tools.build:gradle:7.3.1")
14-
classpath("org.jetbrains.kotlin:kotlin-serialization:2.0.0-RC3")
14+
classpath("org.jetbrains.kotlin:kotlin-serialization:2.0.0")
1515

1616
}
1717
}

example/MultiplatformExample/iosApp/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../shared"
1010

1111
SPEC CHECKSUMS:
12-
shared: 2d3b24a8fe27b7d9e65b8d075a9672fbc6a1aa10
12+
shared: 90ed35de669e9fcb63a61e6b4bb0521eb732cc7a
1313

1414
PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
1515

example/MultiplatformExample/iosApp/Pods/Manifest.lock

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

example/MultiplatformExample/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig

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

example/MultiplatformExample/shared/build.gradle.kts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ plugins {
1010
version = "1.0"
1111
val ktorVersion = "2.3.10"
1212
val ktorfitVersion = "2.0.0-SNAPSHOT"
13-
val ktorfitKsp = "2.0.0-1.0.20-SNAPSHOT"
1413

1514
kotlin {
1615
jvmToolchain(8)
@@ -74,25 +73,6 @@ android {
7473
}
7574
}
7675

77-
dependencies {
78-
with("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitKsp") {
79-
add("kspCommonMainMetadata", this)
80-
add("kspJvm", this)
81-
add("kspJvmTest", this)
82-
add("kspAndroid", this)
83-
add("kspAndroidTest", this)
84-
add("kspIosX64", this)
85-
add("kspIosX64Test", this)
86-
add("kspIosArm64", this)
87-
add("kspIosArm64Test", this)
88-
add("kspIosSimulatorArm64", this)
89-
add("kspIosSimulatorArm64Test", this)
90-
add("kspMacosX64", this)
91-
add("kspMacosX64Test", this)
92-
add("kspJs", this)
93-
add("kspJsTest", this)
94-
}
95-
}
9676

9777
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
9878
kotlinOptions {

ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
4646

4747

4848

49-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
5049
override fun getPluginArtifact(): SubpluginArtifact {
5150
return SubpluginArtifact(
5251
groupId = GROUP_NAME,
5352
artifactId = ARTIFACT_NAME,
54-
version = "2.0.0-SNAPSHOT-"+ myproject.kotlinExtension.compilerVersion // remember to bump this version before any release!
53+
version = "2.0.0-SNAPSHOT-"+ "2.0.0" // remember to bump this version before any release!
5554
)
5655
}
5756
}

ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ class KtorfitGradlePlugin : Plugin<Project> {
5656
}
5757
}
5858

59-
else -> { /* Do nothing */
60-
}
59+
else -> Unit
6160
}
6261
}
6362
}
@@ -92,7 +91,3 @@ class KtorfitGradlePlugin : Plugin<Project> {
9291
this.extensions.findByType(KtorfitGradleConfiguration::class.java) ?: KtorfitGradleConfiguration()
9392

9493
}
95-
96-
fun Project.config() {
97-
98-
}

0 commit comments

Comments
 (0)