Skip to content

Commit 2f10b17

Browse files
- Upgrading to Gradle 8.5
- Upgrading to Kotlin to 1.9.22 - Upgrading to Array to 1.2.1
1 parent 8d81800 commit 2f10b17

File tree

10 files changed

+219
-198
lines changed

10 files changed

+219
-198
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,22 @@ on:
1010

1111
jobs:
1212
build:
13-
1413
runs-on: ubuntu-latest
15-
14+
1615
permissions:
1716
contents: read
1817
packages: write
1918

2019
steps:
21-
- uses: actions/checkout@v2
22-
- name: Set up JDK 11
23-
uses: actions/setup-java@v2
20+
- uses: actions/checkout@v4
21+
- name: Set up JDK 21
22+
uses: actions/setup-java@v4
2423
with:
25-
java-version: '11'
26-
distribution: 'adopt'
27-
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
28-
settings-path: ${{ github.workspace }} # location for the settings.xml file
24+
java-version: '21'
25+
distribution: 'temurin'
26+
cache: 'gradle'
2927

3028
- name: Grant execute permission for gradlew
3129
run: chmod +x gradlew
3230
- name: Build with Gradle
33-
run: ./gradlew build
34-
31+
run: ./gradlew build

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
# Ignore Gradle project-specific cache directory
2-
.gradle
3-
4-
# Ignore Gradle build output directory
5-
build
6-
1+
.gradle/
2+
build/
73
.idea/*
84
*.iml
95
target/*
106
.DS_Store
117
*.iws
128
*.ipr
9+
.java-version

build.gradle

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,34 @@
1-
/*
2-
* This file was generated by the Gradle 'init' task.
3-
*
4-
* This generated file contains a sample Kotlin application project to get you started.
5-
*/
6-
71
plugins {
8-
// Apply the Kotlin JVM plugin to add support for Kotlin.
9-
id 'org.jetbrains.kotlin.jvm' version '1.6.21'
10-
11-
// Apply the application plugin to add support for building a CLI application.
2+
id 'org.jetbrains.kotlin.jvm' version '1.9.22'
3+
id 'org.jetbrains.kotlin.kapt' version '1.9.22'
124
id 'application'
135
id 'idea'
146
}
157

16-
apply plugin: 'kotlin-kapt'
17-
188
repositories {
19-
// Use jcenter for resolving dependencies.
20-
// You can declare any Maven/Ivy/file repository here.
219
mavenCentral()
22-
jcenter()
23-
maven { url "https://dl.bintray.com/arrow-kt/arrow-kt/" }
2410
}
2511

26-
def arrow_version = "0.10.5"
12+
def arrowVersion = "1.2.1"
13+
def junitVersion = "5.10.1"
2714

2815
dependencies {
29-
compile "io.arrow-kt:arrow-core:$arrow_version"
30-
compile "io.arrow-kt:arrow-syntax:$arrow_version"
31-
kapt "io.arrow-kt:arrow-meta:$arrow_version"
32-
33-
// Align versions of all Kotlin components
3416
implementation platform('org.jetbrains.kotlin:kotlin-bom')
35-
36-
// Use the Kotlin JDK 8 standard library.
3717
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
38-
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.9.2')
39-
40-
testImplementation 'org.assertj:assertj-core:3.24.2'
41-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
42-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
18+
19+
implementation "io.arrow-kt:arrow-core:$arrowVersion"
20+
implementation "io.arrow-kt:arrow-fx-coroutines:$arrowVersion"
21+
22+
testImplementation "org.assertj:assertj-core:3.25.1"
23+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
24+
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
25+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
4326
}
4427

4528
test {
4629
useJUnitPlatform()
4730
}
4831

4932
application {
50-
// Define the main class for the application.
51-
mainClassName = 'RailwayOrientedProgramming.AppKt'
52-
}
33+
mainClass = 'RailwayOrientedProgramming.AppKt'
34+
}

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)