Skip to content

Commit

Permalink
Upgrade gradle, kotlin, clean up dependencies
Browse files Browse the repository at this point in the history
* Gradle -> 6.2
* Kotlin -> 1.3.61
* Upgrade a bunch of other dependencies
* Remove kotlintest
  • Loading branch information
ogolberg authored Feb 21, 2020
1 parent 4bd1277 commit 9d6cd93
Show file tree
Hide file tree
Showing 11 changed files with 311 additions and 279 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ out
.idea
*.iml

.kotlintest
testing/conformance-driver/failing_tests.txt
protokt-codegen/src/test/resources/com/toasttab/protokt/test-proto-bin-request.bin
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ subprojects {
dependencies {
add("api", libraries.kotlinStdlib)

add("testImplementation", libraries.kotlinTest)
add("testImplementation", libraries.junit)
add("testImplementation", libraries.truth)
}
Expand Down
19 changes: 8 additions & 11 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,20 @@ import com.toasttab.protokt.shared.DEFAULT_PROTOBUF_VERSION
object versions {
const val arrow = "0.10.4"
const val autoService = "1.0-rc6"
const val grpc = "1.23.0"
const val jackson = "2.10.0"
const val jackson = "2.10.2"
const val kollection = "0.7"
const val kotlin = "1.3.50"
const val kotlin = "1.3.61"
const val kotlinxCoroutines = "1.2.1"
const val protobuf = DEFAULT_PROTOBUF_VERSION
const val protobufPlugin = "0.8.10"
const val stringTemplate = "4.1"
const val protobufPlugin = "0.8.11"
const val stringTemplate = "4.3"

// Test
const val datasets = "0.1.0"
const val gradleDownload = "3.4.3"
const val jmh = "1.21"
const val junit = "5.5.2"
const val kotlinTest = "3.4.2"
const val truth = "1.0"
const val gradleDownload = "4.0.4"
const val jmh = "1.23"
const val junit = "5.6.0"
const val truth = "1.0.1"
const val wire = "3.0.0-alpha01"

// Third Party
Expand Down Expand Up @@ -68,7 +66,6 @@ object libraries {
// Test
const val jackson = "com.fasterxml.jackson.module:jackson-module-kotlin:${versions.jackson}"
const val junit = "org.junit.jupiter:junit-jupiter:${versions.junit}"
const val kotlinTest = "io.kotlintest:kotlintest-runner-junit5:${versions.kotlinTest}"
const val truth = "com.google.truth:truth:${versions.truth}"

// Benchmarks
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-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

Expand Down
2 changes: 0 additions & 2 deletions testing/conformance-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
*/

dependencies {
testImplementation(libraries.junit)
testImplementation(libraries.kotlinStdlib)
testImplementation(libraries.protobuf)
}

Expand Down
3 changes: 0 additions & 3 deletions testing/options/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,5 @@ dependencies {

testImplementation(project(":testing:runtime-tests"))
testImplementation(libraries.jackson)
testImplementation(libraries.junit)
testImplementation(libraries.kotlinTest)
testImplementation(libraries.protobuf)
testImplementation(libraries.truth)
}
5 changes: 0 additions & 5 deletions testing/runtime-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,5 @@ pureKotlin()
dependencies {
implementation(kotlin("reflect"))
implementation(project(":testing:protobuf-java"))
implementation(libraries.kotlinStdlib)

testImplementation(libraries.junit)
testImplementation(libraries.kotlinTest)
testImplementation(libraries.protobuf)
testImplementation(libraries.truth)
}

This file was deleted.

Loading

0 comments on commit 9d6cd93

Please sign in to comment.