diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts index 86d5136b7..8ca474ce2 100644 --- a/compiler-plugin/build.gradle.kts +++ b/compiler-plugin/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") +val enableSigning = project.hasProperty("signingInMemoryKey") plugins { kotlin("jvm") diff --git a/compiler-plugin/src/main/java/de/jensklingenberg/ktorfit/CreateFuncTransformer.kt b/compiler-plugin/src/main/java/de/jensklingenberg/ktorfit/CreateFuncTransformer.kt index bd066494d..7e0a802c3 100644 --- a/compiler-plugin/src/main/java/de/jensklingenberg/ktorfit/CreateFuncTransformer.kt +++ b/compiler-plugin/src/main/java/de/jensklingenberg/ktorfit/CreateFuncTransformer.kt @@ -90,9 +90,6 @@ class CreateFuncTransformer( //Set _ExampleApiImpl() as argument for create() irCall.putValueArgument(0, newCall) - debugLogger.log( - "Transformed " + argumentType.toIrBasedKotlinType().toString() + " to _$className" + "Impl" - ) return super.visitExpression(irCall) } } diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts index 167d37e7c..9e510d1fe 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -2,7 +2,7 @@ buildscript { repositories { gradlePluginPortal() google() - // mavenLocal() + mavenLocal() mavenCentral() } dependencies { @@ -16,7 +16,7 @@ buildscript { allprojects { repositories { google() - // mavenLocal() + mavenLocal() mavenCentral() } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 6140e0277..ef46c58f4 100644 --- a/example/MultiplatformExample/shared/build.gradle.kts +++ b/example/MultiplatformExample/shared/build.gradle.kts @@ -4,12 +4,12 @@ plugins { id("com.android.library") id("com.google.devtools.ksp") version "1.9.10-1.0.13" id("kotlinx-serialization") - id("de.jensklingenberg.ktorfit") version "1.7.0" + id("de.jensklingenberg.ktorfit") version "1.7.0-1.9.20-Beta2" } version = "1.0" val ktorVersion = "2.3.4" -val ktorfitVersion = "1.7.0" +val ktorfitVersion = "1.7.0-1.9.20-Beta2" kotlin { jvmToolchain(8) diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index bd300b2b9..54fef0ee9 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "de.jensklingenberg.ktorfit" -version = "1.7.0" +version = "1.7.0-1.9.20-Beta2" allprojects { @@ -49,20 +49,11 @@ gradlePlugin { } } -tasks.register("sourcesJar", Jar::class) { - group = "build" - description = "Assembles Kotlin sources" - - archiveClassifier.set("sources") - from(sourceSets.main.get().allSource) - dependsOn(tasks.classes) -} publishing { publications { create("default") { from(components["java"]) - artifact(tasks["sourcesJar"]) pom { name.set("ktorfit-gradle-plugin") diff --git a/gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleSubPlugin.kt b/gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleSubPlugin.kt index 95a51b1b4..19199bf01 100644 --- a/gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleSubPlugin.kt +++ b/gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleSubPlugin.kt @@ -16,7 +16,7 @@ open class KtorfitGradleConfiguration { /** * version number of the compiler plugin */ - var version: String = "1.7.0" // remember to bump this version before any release! + var version: String = "1.7.0-1.9.20-Beta2" // remember to bump this version before any release! /** * used to get debug information from the compiler plugin diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3fab81e33..1ffaa699c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,14 +5,15 @@ coroutines = "1.7.3" detekt = "1.23.1" gradlePlugin = "1.7.0" kctfork = "0.3.2" -kotlin = "1.9.10" +kotlin = "1.9.20-Beta2" kotlinPoet = "1.14.2" -kspVersion = "1.9.10-1.0.13" -ktorfit = "1.7.0" -ktorfit-lib = "1.7.0" +kspVersion = "1.9.20-Beta2-1.0.13" +ktorfit = "1.7.0-1.9.20-Beta2" +ktorfit-lib = "1.7.0-1.9.20-Beta2" ktorVersion = "2.3.4" gradleMavenPublishPlugin = "0.25.3" vannikMavenPublish = "0.25.3" +kotlin-serialization = "1.9.10" [libraries] android-build-gradle = "com.android.tools.build:gradle:7.4.2" @@ -24,7 +25,7 @@ junit = "junit:junit:4.13.2" kctfork-core = { module = "dev.zacsweers.kctfork:core", version.ref = "kctfork" } kctfork-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "kctfork" } kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } -kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } +kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin-serialization" } kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" } kotlinPoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinPoet" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } diff --git a/ktorfit-annotations/build.gradle.kts b/ktorfit-annotations/build.gradle.kts index a94b35de0..9c853c941 100644 --- a/ktorfit-annotations/build.gradle.kts +++ b/ktorfit-annotations/build.gradle.kts @@ -94,7 +94,7 @@ android { namespace = "de.jensklingenberg.ktorfit.annotations" } -val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") +val enableSigning = project.hasProperty("signingInMemoryKey") mavenPublishing { coordinates( diff --git a/ktorfit-ksp/build.gradle.kts b/ktorfit-ksp/build.gradle.kts index acb19fcdc..44a063004 100644 --- a/ktorfit-ksp/build.gradle.kts +++ b/ktorfit-ksp/build.gradle.kts @@ -1,6 +1,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") +val enableSigning = project.hasProperty("signingInMemoryKey") plugins { kotlin("jvm") diff --git a/ktorfit-lib-common/build.gradle.kts b/ktorfit-lib-common/build.gradle.kts index 3ff6667c8..b9512f1be 100644 --- a/ktorfit-lib-common/build.gradle.kts +++ b/ktorfit-lib-common/build.gradle.kts @@ -36,7 +36,7 @@ detekt { buildUponDefaultConfig = false } -val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") +val enableSigning = project.hasProperty("signingInMemoryKey") mavenPublishing { diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts index 1ef0dbd5e..b449cb1e9 100644 --- a/ktorfit-lib/build.gradle.kts +++ b/ktorfit-lib/build.gradle.kts @@ -14,7 +14,7 @@ licensee { } -val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") +val enableSigning = project.hasProperty("signingInMemoryKey") mavenPublishing {