diff --git a/.idea/artifacts/kotlin_plugin_js_1_3_0.xml b/.idea/artifacts/kotlin_plugin_js_1_3_0.xml index 11df68e..7a89505 100644 --- a/.idea/artifacts/kotlin_plugin_js_1_3_0.xml +++ b/.idea/artifacts/kotlin_plugin_js_1_3_0.xml @@ -2,7 +2,7 @@ $PROJECT_DIR$/kotlin-plugin/build/libs - + \ No newline at end of file diff --git a/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml b/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml index e8cc8fa..05c532b 100644 --- a/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml +++ b/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml @@ -2,7 +2,7 @@ $PROJECT_DIR$/kotlin-plugin/build/libs - + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index c224ad5..bb44937 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 6eda5b7..afc6e90 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,10 @@ - plugins { `kotlin-dsl` - kotlin("multiplatform") version "2.0.21" apply false - kotlin("jvm") version "2.0.21" apply false - id("io.github.gradle-nexus.publish-plugin") version "1.3.0" + kotlin("multiplatform") version "2.1.0" apply false + kotlin("jvm") version "2.1.0" apply false + id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1" + id("com.vanniktech.maven.publish") version "0.29.0" apply false + id("org.jetbrains.dokka") version "1.9.20" apply false } object Conf { @@ -56,4 +57,11 @@ repositories { mavenCentral() } -// Root project - only manages subprojects and Maven Central publishing configuration +nexusPublishing { + // Configure maven central repository + // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh + repositories { + sonatype() + + } +} diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index 131fb41..347176f 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -5,7 +5,7 @@ plugins { `java-gradle-plugin` application signing - id("com.vanniktech.maven.publish") version "0.29.0" + id("com.vanniktech.maven.publish") } repositories { diff --git a/kotlin-plugin/build.gradle.kts b/kotlin-plugin/build.gradle.kts index 9290130..befde4e 100644 --- a/kotlin-plugin/build.gradle.kts +++ b/kotlin-plugin/build.gradle.kts @@ -1,9 +1,12 @@ +import com.vanniktech.maven.publish.JavadocJar +import com.vanniktech.maven.publish.KotlinMultiplatform import com.vanniktech.maven.publish.SonatypeHost plugins { kotlin("multiplatform") - application signing - id("com.vanniktech.maven.publish") version "0.29.0" + `maven-publish` + id("com.vanniktech.maven.publish") + id("org.jetbrains.dokka") } repositories { @@ -120,9 +123,11 @@ signing { } mavenPublishing { + configure(KotlinMultiplatform(javadocJar = JavadocJar.Dokka("dokkaHtml"))) publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) if (project.hasProperty("mavenCentralUsername") || System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null - ) + ) { signAllPublications() -} \ No newline at end of file + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ddb7f5..313bc12 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,10 +3,6 @@ pluginManagement { gradlePluginPortal() mavenCentral() } - plugins { - kotlin("jvm") version "1.9.0" apply false - kotlin("kapt") version "1.9.0" apply false - } } plugins { @@ -19,5 +15,6 @@ dependencyResolutionManagement { } } +rootProject.name = "renlin-compiler" include(":gradle-plugin") include(":kotlin-plugin")