From 18d51fa829197084c6638216277f63cbea7a1e3d Mon Sep 17 00:00:00 2001 From: John Woo <1911939+wooj2@users.noreply.github.com> Date: Tue, 14 Dec 2021 14:36:13 -0800 Subject: [PATCH] chore: update build system to remove hardcoded maven urls (#507) --- build.gradle.kts | 5 +++-- buildSrc/build.gradle.kts | 3 ++- gradle.properties | 7 +++++-- settings.gradle.kts | 17 ++++++++++++++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c64da550364..a3ae01eaf5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,15 +2,16 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0. */ + plugins { - kotlin("jvm") version "1.5.0" apply false + kotlin("jvm") version "1.5.31" apply false + id("org.jetbrains.dokka") } allprojects { repositories { mavenLocal() mavenCentral() - jcenter() } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bdcceb05671..27f29d4d6ae 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,5 +10,6 @@ plugins { } repositories { - jcenter() + mavenLocal() + mavenCentral() } diff --git a/gradle.properties b/gradle.properties index a8bed8291fb..bd9e63ddc80 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,18 @@ kotlin.code.style=official # codegen smithyVersion=1.13.1 +smithyGradleVersion=0.5.3 smithySwiftVersion = 0.1.0 # kotlin -kotlinVersion=1.5.0 +kotlinVersion=1.5.31 +dokkaVersion=1.5.31 kotlin.native.ignoreDisabledTargets=true - # testing/utility +kotlinxBenchmarkVersion=0.3.1 + # FIXME - junit5 not working ktlintVersion=0.40.0 kotestVersion=4.0.5 diff --git a/settings.gradle.kts b/settings.gradle.kts index 8ca8e26160a..e2bc301c86b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,11 +5,22 @@ pluginManagement { repositories { - maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") } - maven { url = uri("https://kotlin.bintray.com/kotlinx") } - + mavenCentral() + maven("https://plugins.gradle.org/m2/") + google() gradlePluginPortal() } + + plugins { + val kotlinVersion: String by settings + val dokkaVersion: String by settings + val kotlinxBenchmarkVersion: String by settings + val smithyGradleVersion: String by settings + id("org.jetbrains.dokka") version dokkaVersion + id("org.jetbrains.kotlin.jvm") version kotlinVersion + id("org.jetbrains.kotlinx.benchmark") version kotlinxBenchmarkVersion + id("software.amazon.smithy") version smithyGradleVersion + } } rootProject.name = "aws-sdk-swift"