Skip to content

Commit 3ca4723

Browse files
authored
chore: update build system to remove hardcoded maven urls (#392)
1 parent 43bdf35 commit 3ca4723

File tree

5 files changed

+37
-7
lines changed

5 files changed

+37
-7
lines changed

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ allprojects {
1212
repositories {
1313
mavenCentral()
1414
mavenLocal()
15-
jcenter()
1615
}
1716
}
1817

@@ -41,4 +40,4 @@ tasks.register<JavaExec>("ktlintFormat") {
4140
classpath = configurations.getByName("ktlint")
4241
main = "com.pinterest.ktlint.Main"
4342
args = listOf("-F") + lintPaths
44-
}
43+
}

buildSrc/build.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66
plugins {
77
`kotlin-dsl`
88
}
9+
buildscript {
10+
repositories {
11+
mavenCentral()
12+
}
13+
}
914

1015
repositories {
11-
jcenter()
16+
mavenLocal()
17+
mavenCentral()
18+
gradlePluginPortal()
1219
}

gradle.properties

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@ kotlin.code.style=official
44

55
# codegen
66
smithyVersion=1.13.1
7+
smithyGradleVersion=0.5.3
8+
79
# kotlin
8-
kotlinVersion=1.5.0
10+
kotlinVersion=1.5.31
11+
dokkaVersion=1.5.31
912
kotlin.native.ignoreDisabledTargets=true
1013

1114
# kotlin libraries
1215
coroutinesVersion=1.5.0
1316
commonMarkParserVersion=0.15.2
1417
jsoupVersion=1.14.3
18+
1519
# testing/utility
20+
kotlinxBenchmarkVersion=0.3.1
21+
1622
# FIXME - junit5 not working
1723
junitVersion=5.6.2
1824
ktlintVersion=0.40.0

settings.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
33
* SPDX-License-Identifier: Apache-2.0.
44
*/
55

6+
pluginManagement {
7+
repositories {
8+
mavenCentral()
9+
maven("https://plugins.gradle.org/m2/")
10+
google()
11+
gradlePluginPortal()
12+
}
13+
14+
// configure default plugin versions
15+
plugins {
16+
val kotlinVersion: String by settings
17+
val dokkaVersion: String by settings
18+
val kotlinxBenchmarkVersion: String by settings
19+
val smithyGradleVersion: String by settings
20+
id("org.jetbrains.dokka") version dokkaVersion
21+
id("org.jetbrains.kotlin.jvm") version kotlinVersion
22+
id("org.jetbrains.kotlinx.benchmark") version kotlinxBenchmarkVersion
23+
id("software.amazon.smithy") version smithyGradleVersion
24+
}
25+
}
26+
627
rootProject.name = "smithy-swift"
728

829
include("smithy-swift-codegen")

smithy-swift-codegen/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ tasks.jar {
7070
}
7171
}
7272

73-
// Always build documentation
74-
tasks["build"].finalizedBy(tasks["dokkaHtml"])
75-
7673
// Configure jacoco (code coverage) to generate an HTML report
7774
tasks.jacocoTestReport {
7875
reports {

0 commit comments

Comments
 (0)