From 602f5f4ebe1467dc2bddaff9fda524d8289ac6ed Mon Sep 17 00:00:00 2001 From: James Fenn Date: Fri, 14 May 2021 15:43:18 -0400 Subject: [PATCH] update version numbers & migrate dependencies --- build.gradle | 15 +++++++-------- docs/build.gradle | 2 +- example/build.gradle | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index c45110d..ab23830 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' - ext.ktor_version = '1.3.2' - ext.serialization_version = '0.20.0' + ext.kotlin_version = '1.5.0' + ext.ktor_version = '1.4.3' + ext.serialization_version = '0.2.1' repositories { - google() - jcenter() + mavenCentral() maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" @@ -23,8 +21,9 @@ buildscript { allprojects { repositories { - google() - jcenter() + mavenCentral() + maven { url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" } + maven { url "https://kotlin.bintray.com/kotlinx" } maven { url 'https://kotlin.bintray.com/ktor' } } } diff --git a/docs/build.gradle b/docs/build.gradle index 7e5495a..d2956e0 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation "io.ktor:ktor-server-core:$ktor_version" implementation "io.ktor:ktor-auth:$ktor_version" - implementation "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1" + implementation "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3" implementation "com.atlassian.commonmark:commonmark:0.15.2" } diff --git a/example/build.gradle b/example/build.gradle index a2fa245..8103fa9 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'kotlin' apply plugin: 'application' group 'me.jfenn' -version '0.0.1' +version '0.0.2' mainClassName = "io.ktor.server.netty.EngineMain" sourceSets { @@ -16,7 +16,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "io.ktor:ktor-server-netty:$ktor_version" implementation "io.ktor:ktor-auth:$ktor_version" - implementation "ch.qos.logback:logback-classic:$logback_version" testImplementation "io.ktor:ktor-server-tests:$ktor_version" implementation project(':docs') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c4388a..da9702f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- GitLab