Skip to content

Commit

Permalink
Upgrade several things (#3)
Browse files Browse the repository at this point in the history
* Upgrade gradle, spotless and kotlin

* Use correct JDK version on pipeline

* Upgrade checkout action version

* Upgrade gradle from 7.5 to 8.0

* Upgrade actions/setup-java to v3.13.0

* Upgrade Kotlin to 1.9.10
  • Loading branch information
isamadrid90 authored Nov 27, 2023
1 parent 40eb33d commit 6b01caa
Show file tree
Hide file tree
Showing 6 changed files with 187 additions and 121 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3.13.0
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew build
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.8.10"
id("com.diffplug.spotless") version "6.17.0"
kotlin("jvm") version "1.9.10"
id("com.diffplug.spotless") version "6.22.0"
application
}

group = "com.codely"
version = "0.0.1-SNAPSHOT"
java.sourceCompatibility = JavaVersion.VERSION_11
java.sourceCompatibility = JavaVersion.VERSION_17

repositories {
mavenCentral()
Expand All @@ -18,7 +18,7 @@ dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.17.0")
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.22.0")

testImplementation("org.jetbrains.kotlin:kotlin-test")
}
Expand All @@ -29,7 +29,7 @@ application {
tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xjsr305=strict")
jvmTarget = "11"
jvmTarget = "17"
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 6b01caa

Please sign in to comment.