Skip to content

Commit 2de9916

Browse files
committed
Update Kotlin, dependencies and versions
1 parent e253416 commit 2de9916

File tree

5 files changed

+21
-29
lines changed

5 files changed

+21
-29
lines changed

build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
plugins {
24
`maven-publish`
3-
kotlin("multiplatform") version "1.6.10" apply false
5+
kotlin("multiplatform") version "1.6.20" apply false
46
}
57

68
allprojects {
@@ -10,4 +12,10 @@ allprojects {
1012
repositories {
1113
mavenCentral()
1214
}
15+
16+
tasks {
17+
withType<KotlinCompile> {
18+
kotlinOptions.jvmTarget = "11"
19+
}
20+
}
1321
}

buildSrc/src/main/kotlin/publish-script.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ plugins {
66
val githubRepo = "jakobkmar/kotlin-openapi-generator"
77

88
publishing {
9+
repositories {
10+
maven {
11+
name = "ossrh"
12+
credentials(PasswordCredentials::class)
13+
setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
14+
}
15+
}
16+
917
publications.withType<MavenPublication> {
1018
pom {
1119
description.set(project.description)

openapigenerator-gradle-plugin/build.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "0.1.1"
1+
version = "0.1.2"
22

33
plugins {
44
`java-gradle-plugin`
@@ -11,7 +11,7 @@ plugins {
1111
dependencies {
1212
implementation(gradleKotlinDsl())
1313

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

@@ -33,14 +33,6 @@ gradlePlugin {
3333
}
3434

3535
publishing {
36-
repositories {
37-
maven {
38-
name = "ossrh"
39-
credentials(PasswordCredentials::class)
40-
setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
41-
}
42-
}
43-
4436
publications.withType<MavenPublication> {
4537
pom {
4638
name.set("Kotlin OpenAPI Generator Gradle Plugin")

openapigenerator/build.gradle.kts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
3-
version = "0.0.1"
1+
version = "0.0.2"
42

53
plugins {
64
kotlin("multiplatform")
@@ -27,25 +25,11 @@ kotlin {
2725
}
2826
}
2927

30-
tasks {
31-
withType<KotlinCompile> {
32-
kotlinOptions.jvmTarget = "11"
33-
}
34-
}
35-
3628
val stubJavadocJar by tasks.registering(Jar::class) {
3729
archiveClassifier.set("javadoc")
3830
}
3931

4032
publishing {
41-
repositories {
42-
maven {
43-
name = "ossrh"
44-
credentials(PasswordCredentials::class)
45-
setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
46-
}
47-
}
48-
4933
publications {
5034
register<MavenPublication>(project.name) {
5135
this.groupId = project.group.toString()

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencyResolutionManagement {
66
library("kotlinx-serialization-json", "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
77

88
library("okio", "com.squareup.okio:okio:3.0.0")
9-
library("kotlinpoet", "com.squareup:kotlinpoet:1.10.2")
9+
library("kotlinpoet", "com.squareup:kotlinpoet:1.11.0")
1010
}
1111
}
1212
}

0 commit comments

Comments
 (0)