Skip to content

Commit

Permalink
Merge remote-tracking branch 'kotlin-ktor-sapling/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mdnorman committed Jan 8, 2022
2 parents 251d5b3 + 1ed69c3 commit 3ddca56
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 11 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: CI
on:
push:
branches: [ $default-branch ]
pull_request:
branches: [ '**' ]

jobs:
build:
runs-on: ubuntu-latest
container:
image: openjdk:17.0.1-jdk

steps:
- name: Check out code
uses: actions/checkout@v2
- name: Build with Gradle
uses: gradle/gradle-build-action@v2.1.0
with:
arguments: build shadowJar
20 changes: 10 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ version = "0.0.1"

val applicationClassName = "CHANGEME"

val kotlinVersion = "1.3.61"
val ktorVersion = "1.6.5"
val junitVersion = "5.8.1"
val kotlinVersion = "1.6.0"
val ktorVersion = "1.6.7"
val junitVersion = "5.8.2"

plugins {
kotlin("jvm") version "1.6.0"
id("org.jetbrains.dokka") version "1.6.0"
kotlin("jvm") version "1.6.10"
id("org.jetbrains.dokka") version "1.6.10"
java
application
id("com.github.johnrengelman.shadow") version "4.0.3"
Expand All @@ -28,20 +28,20 @@ plugins {

repositories {
mavenLocal()
maven("https://kotlin.bintray.com/ktor")
mavenCentral()
maven("https://kotlin.bintray.com/ktor")
}

dependencies {
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1")
implementation("com.apurebase:kgraphql:0.17.14")
implementation("io.github.microutils:kotlin-logging:2.1.0")
implementation("io.github.microutils:kotlin-logging:2.1.21")
implementation("io.ktor:ktor-auth:$ktorVersion")
implementation("io.ktor:ktor-auth-jwt:$ktorVersion")
implementation("io.ktor:ktor-jackson:$ktorVersion")
implementation("io.ktor:ktor-metrics:$ktorVersion")
implementation("io.ktor:ktor-server-netty:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
implementation("org.slf4j:slf4j-simple:1.7.32")
implementation(kotlin("reflect", kotlinVersion))
implementation(kotlin("stdlib-jdk8", kotlinVersion))
Expand Down Expand Up @@ -73,7 +73,7 @@ val sourceJar by tasks.creating(Jar::class) {

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "1.17"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 3ddca56

Please sign in to comment.