Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various dependency updates #56

Merged
merged 2 commits into from
May 26, 2020
Merged

Various dependency updates #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20c6707
various dependency updates
andrewparmet May 26, 2020
fe5e99a
gradle 6.4.1
andrewparmet May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@
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.28.0"
const val jackson = "2.10.2"
const val arrow = "0.10.5"
const val autoService = "1.0-rc7"
const val grpc = "1.29.0"
const val jackson = "2.11.0"
const val kollection = "0.7"
const val kotlin = "1.3.61"
const val kotlinxCoroutines = "1.2.1"
const val kotlin = "1.3.72"
const val kotlinxCoroutines = "1.3.7"
const val protobuf = DEFAULT_PROTOBUF_VERSION
const val protobufPlugin = "0.8.11"
const val protobufPlugin = "0.8.12"
const val stringTemplate = "4.3"

// Test
const val datasets = "0.1.0"
const val gradleDownload = "4.0.4"
const val jmh = "1.23"
const val junit = "5.6.0"
const val junit = "5.6.2"
const val truth = "1.0.1"
const val wire = "3.0.0-alpha01"

// Third Party
const val protoGoogleCommonProtos = "1.17.0"
const val protoGoogleCommonProtos = "1.18.0"
}

object libraries {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 0 additions & 2 deletions gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Expand Down Expand Up @@ -130,7 +129,6 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
Expand Down
1 change: 0 additions & 1 deletion gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ set CMD_LINE_ARGS=%*

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

Expand Down