Skip to content

Commit ee4be31

Browse files
committed
Kotlin to 1.4.32 and bump min Gradle to 7.1.1
1 parent dcec25d commit ee4be31

File tree

9 files changed

+5
-17
lines changed

9 files changed

+5
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Once you setup the plugin correctly, you can call the `:generateSwagger` gradle
5656

5757
In order to run this gradle plugin you need to fulfill the following requirements:
5858

59-
* Gradle 5.x - This plugin uses Gradle 5 features, and you will need to setup your Gradle wrapper to use 5.4.1 or more.
59+
* Gradle 6.x - This plugin uses Gradle 6 features, and you will need to setup your Gradle wrapper to use 6.8 or more.
6060
* Java 8+
6161

6262
## Supported platforms

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ plugins {
5858
id("com.yelp.codegen.plugin").version("1.4.1").apply(false)
5959
id("io.gitlab.arturbosch.detekt").version("1.17.1").apply(false)
6060
id("com.github.ben-manes.versions") version "0.39.0"
61-
kotlin("android").version("1.3.72").apply(false)
61+
kotlin("android").version("1.4.32").apply(false)
6262
}
6363

6464
subprojects {

gradle-plugin/plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("java-gradle-plugin")
99
`maven-publish`
1010
jacoco
11-
kotlin("jvm") version "1.3.72"
11+
kotlin("jvm") version "1.4.32"
1212
id("com.gradle.plugin-publish") version "0.15.0"
1313
id("io.gitlab.arturbosch.detekt") version "1.17.1"
1414
id("com.github.ben-manes.versions") version "0.39.0"

gradle-plugin/plugin/src/test/java/com/yelp/plugin/PluginTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class PluginTests {
4040

4141
val result = GradleRunner.create()
4242
.withProjectDir(projectDir)
43-
.withGradleVersion("5.4.1")
43+
.withGradleVersion("6.8")
4444
.forwardStdOutput(System.out.writer())
4545
.forwardStdError(System.err.writer())
4646
.withArguments("generateSwagger")

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
# Remember to update the README.md file once the version is updated
44
# Prevent https://github.com/Yelp/swagger-gradle-codegen/issues/108 to happen again
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

samples/groovy-android/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ android {
1919
}
2020

2121
dependencies {
22-
// Kotlin
23-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
24-
2522
// Moshi + OkHttp + Retrofit
2623
implementation "com.squareup.moshi:moshi:1.12.0"
2724
implementation "com.squareup.moshi:moshi-adapters:1.12.0"

samples/junit-tests/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ plugins {
66
}
77

88
dependencies {
9-
// Kotlin
10-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
11-
129
// Moshi + OkHttp + Retrofit
1310
implementation "com.squareup.moshi:moshi:1.12.0"
1411
implementation "com.squareup.moshi:moshi-adapters:1.12.0"

samples/kotlin-android/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ android {
1818
}
1919

2020
dependencies {
21-
// Kotlin
22-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72")
23-
2421
// Moshi + OkHttp + Retrofit
2522
implementation("com.squareup.moshi:moshi:1.12.0")
2623
implementation("com.squareup.moshi:moshi-adapters:1.12.0")

samples/kotlin-coroutines/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ android {
1919
}
2020

2121
dependencies {
22-
// Kotlin
23-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
24-
2522
// Moshi + OkHttp + Retrofit
2623
implementation "com.squareup.moshi:moshi:1.12.0"
2724
implementation "com.squareup.moshi:moshi-adapters:1.12.0"

0 commit comments

Comments
 (0)