Skip to content

Commit

Permalink
Upgrade configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
gmulders committed Mar 7, 2024
1 parent af762eb commit 2734c78
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 22 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- name: Checkout repo
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3

- name: Execute Gradle build
run: ./gradlew test
run: ./gradlew :measure:test
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

plugins {
// Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
id("org.jetbrains.kotlin.jvm") version "1.5.0" apply false
id("org.jetbrains.kotlin.jvm") version "1.9.23" apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 8 additions & 11 deletions measure/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
//
// SPDX-License-Identifier: MPL-2.0

/*
* This file was generated by the Gradle 'init' task.
*
* This generated file contains a sample Kotlin library project to get you started.
* For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
* User Manual available at https://docs.gradle.org/6.7.1/userguide/building_java_projects.html
*/

plugins {
// Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
id("org.jetbrains.kotlin.jvm")
Expand All @@ -28,8 +20,7 @@ group = "com.alliander"
version = "1.2"

repositories {
// Use JCenter for resolving dependencies.
jcenter()
mavenCentral()
}

dependencies {
Expand All @@ -44,9 +35,15 @@ dependencies {
testImplementation("io.kotest:kotest-property:4.3.2")
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of("17"))
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}

Expand Down
3 changes: 1 addition & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
* in the user manual at https://docs.gradle.org/6.7.1/userguide/multi_project_builds.html
*/

rootProject.name = "Measure"
rootProject.name = "measure"
include("measure")
include("measure-generator")

pluginManagement {
repositories {
gradlePluginPortal()
jcenter()
}
}

0 comments on commit 2734c78

Please sign in to comment.