Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest versions #41

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,32 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.11
distribution: 'temurin'
java-version: '17'

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Build with Gradle
run: ./gradlew build
- name: Run tests with coverage (codecov)
run: ./gradlew test jacocoTestReport && bash <(curl -s https://codecov.io/bash)
env:
CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
uses: gradle/gradle-build-action@v2
with:
arguments: build

- name: Publish Unit Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
check_name: Unit Test Results
junit_files: |
build/test-results/**/*.xml

- name: Archive test results
uses: actions/upload-artifact@v3
if: failure()
with:
name: test-reports
path: build/reports/tests/test/
43 changes: 20 additions & 23 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,53 +1,50 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URI

val kotlinVersion = "1.3.50"
val http4kVersion = "3.196.0"
val log4jVersion = "2.12.1"
val jacksonVersion = "2.10.0"
val kotlinVersion = "1.8.21"
val http4kVersion = "4.46.0.0"
val log4jVersion = "2.20.0"
val jacksonVersion = "2.15.2"
val jaxbVersion = "2.3.0"
val kotestVersion = "4.0.5"
val kotestVersion = "5.6.2"

plugins {
kotlin("jvm") version "1.3.50"
kotlin("jvm") version "1.8.21"
jacoco
id("com.github.ben-manes.versions") version "0.26.0"
id("com.adarshr.test-logger") version "2.0.0"
id("com.github.ben-manes.versions") version "0.46.0"
id("com.adarshr.test-logger") version "3.2.0"
application
}

application {
mainClassName = "conduit.MainKt"
mainClass.set("conduit.MainKt")
}

repositories {
mavenCentral()
jcenter()
maven { url = URI("http://dl.bintray.com/kotlin/exposed") }
maven { url = URI("https://dl.bintray.com/kotlin/exposed") }
}

dependencies {
implementation("javax.xml.bind:jaxb-api:$jaxbVersion")
implementation("com.sun.xml.bind:jaxb-core:$jaxbVersion")
implementation("com.sun.xml.bind:jaxb-impl:$jaxbVersion")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
implementation("org.http4k:http4k-core:$http4kVersion")
implementation("org.http4k:http4k-server-jetty:$http4kVersion")
implementation("org.http4k:http4k-format-jackson:$http4kVersion")
implementation("org.http4k:http4k-client-apache:$http4kVersion")
implementation("org.jetbrains.exposed:exposed:0.13.6")
implementation("org.jetbrains.exposed:exposed:0.17.14")
implementation("io.jsonwebtoken:jjwt:0.9.1")
implementation("com.h2database:h2:1.4.198")
implementation("com.h2database:h2:1.4.200")
implementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
implementation("org.apache.logging.log4j:log4j-api:$log4jVersion")
implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion")
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:$jacksonVersion")

testImplementation("io.kotest:kotest-runner-junit5-jvm:$kotestVersion") // for kotest framework
testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion") // for kotest core jvm assertions
testImplementation("io.mockk:mockk:1.9.3")
testImplementation("io.mockk:mockk:1.13.5")
}

tasks.withType<Test> {
Expand All @@ -56,12 +53,12 @@ tasks.withType<Test> {

tasks.jacocoTestReport {
reports {
xml.isEnabled = true
xml.required.set(true)
}
}

val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions.jvmTarget = "1.8"

val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions.jvmTarget = "1.8"
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
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-5.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading