Skip to content

Commit

Permalink
Update Kotlin, dependencies and versions
Browse files Browse the repository at this point in the history
  • Loading branch information
jakobkmar committed Apr 7, 2022
1 parent e253416 commit 2de9916
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 29 deletions.
10 changes: 9 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`maven-publish`
kotlin("multiplatform") version "1.6.10" apply false
kotlin("multiplatform") version "1.6.20" apply false
}

allprojects {
Expand All @@ -10,4 +12,10 @@ allprojects {
repositories {
mavenCentral()
}

tasks {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
}
}
}
8 changes: 8 additions & 0 deletions buildSrc/src/main/kotlin/publish-script.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ plugins {
val githubRepo = "jakobkmar/kotlin-openapi-generator"

publishing {
repositories {
maven {
name = "ossrh"
credentials(PasswordCredentials::class)
setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
}
}

publications.withType<MavenPublication> {
pom {
description.set(project.description)
Expand Down
12 changes: 2 additions & 10 deletions openapigenerator-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "0.1.1"
version = "0.1.2"

plugins {
`java-gradle-plugin`
Expand All @@ -11,7 +11,7 @@ plugins {
dependencies {
implementation(gradleKotlinDsl())

implementation("net.axay:openapigenerator-jvm:0.0.1")
implementation("net.axay:openapigenerator-jvm:0.0.2")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2")
}

Expand All @@ -33,14 +33,6 @@ gradlePlugin {
}

publishing {
repositories {
maven {
name = "ossrh"
credentials(PasswordCredentials::class)
setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
}
}

publications.withType<MavenPublication> {
pom {
name.set("Kotlin OpenAPI Generator Gradle Plugin")
Expand Down
18 changes: 1 addition & 17 deletions openapigenerator/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

version = "0.0.1"
version = "0.0.2"

plugins {
kotlin("multiplatform")
Expand All @@ -27,25 +25,11 @@ kotlin {
}
}

tasks {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
}
}

val stubJavadocJar by tasks.registering(Jar::class) {
archiveClassifier.set("javadoc")
}

publishing {
repositories {
maven {
name = "ossrh"
credentials(PasswordCredentials::class)
setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
}
}

publications {
register<MavenPublication>(project.name) {
this.groupId = project.group.toString()
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencyResolutionManagement {
library("kotlinx-serialization-json", "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")

library("okio", "com.squareup.okio:okio:3.0.0")
library("kotlinpoet", "com.squareup:kotlinpoet:1.10.2")
library("kotlinpoet", "com.squareup:kotlinpoet:1.11.0")
}
}
}
Expand Down

0 comments on commit 2de9916

Please sign in to comment.