Skip to content

Commit

Permalink
Update jars
Browse files Browse the repository at this point in the history
  • Loading branch information
@pambrose
pambrose committed May 19, 2020
1 parent a31307d commit 681eadf
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 37 deletions.
64 changes: 32 additions & 32 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,46 +27,46 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-reflect"

implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${serialization_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${coroutines_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${coroutines_version}"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:$coroutines_version"

implementation "io.grpc:grpc-all:${grpc_version}"
implementation "io.grpc:grpc-all:$grpc_version"

implementation "com.github.pambrose.common-utils:core-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:corex-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:dropwizard-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:guava-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:grpc-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:jetty-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:ktor-client-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:prometheus-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:service-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:zipkin-utils:${utils_version}"
implementation "com.github.pambrose.common-utils:core-utils:$utils_version"
implementation "com.github.pambrose.common-utils:corex-utils:$utils_version"
implementation "com.github.pambrose.common-utils:dropwizard-utils:$utils_version"
implementation "com.github.pambrose.common-utils:guava-utils:$utils_version"
implementation "com.github.pambrose.common-utils:grpc-utils:$utils_version"
implementation "com.github.pambrose.common-utils:jetty-utils:$utils_version"
implementation "com.github.pambrose.common-utils:ktor-client-utils:$utils_version"
implementation "com.github.pambrose.common-utils:prometheus-utils:$utils_version"
implementation "com.github.pambrose.common-utils:service-utils:$utils_version"
implementation "com.github.pambrose.common-utils:zipkin-utils:$utils_version"

implementation "org.eclipse.jetty:jetty-servlet:${jetty_version}"
implementation "org.eclipse.jetty:jetty-servlet:$jetty_version"

implementation "javax.annotation:javax.annotation-api:${annotation_version}"
implementation "com.beust:jcommander:${jcommander_version}"
implementation "com.typesafe:config:${typesafe_version}"
implementation "javax.annotation:javax.annotation-api:$annotation_version"
implementation "com.beust:jcommander:$jcommander_version"
implementation "com.typesafe:config:$typesafe_version"

implementation "io.prometheus:simpleclient:${prometheus_version}"
implementation "io.prometheus:simpleclient:$prometheus_version"

implementation "io.ktor:ktor-server-core:${ktor_version}"
implementation "io.ktor:ktor-server-cio:${ktor_version}"
implementation "io.ktor:ktor-client-core:${ktor_version}"
implementation "io.ktor:ktor-client-cio:${ktor_version}"
implementation "io.ktor:ktor-server-core:$ktor_version"
implementation "io.ktor:ktor-server-cio:$ktor_version"
implementation "io.ktor:ktor-client-core:$ktor_version"
implementation "io.ktor:ktor-client-cio:$ktor_version"

implementation "io.dropwizard.metrics:metrics-healthchecks:${dropwizard_version}"
implementation "io.dropwizard.metrics:metrics-healthchecks:$dropwizard_version"

implementation "io.zipkin.brave:brave-instrumentation-grpc:${zipkin_version}"
implementation "io.zipkin.brave:brave-instrumentation-grpc:$zipkin_version"

implementation "io.github.microutils:kotlin-logging:${logging_version}"
implementation "ch.qos.logback:logback-classic:${logback_version}"
implementation "org.slf4j:jul-to-slf4j:${slf4j_version}"
implementation "io.github.microutils:kotlin-logging:$logging_version"
implementation "ch.qos.logback:logback-classic:$logback_version"
implementation "org.slf4j:jul-to-slf4j:$slf4j_version"

testImplementation "org.amshove.kluent:kluent:${kluent_version}"
testImplementation "org.amshove.kluent:kluent:$kluent_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
}
Expand All @@ -86,10 +86,10 @@ compileKotlin.dependsOn ':generateProto'

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${protoc_version}"
artifact = "com.google.protobuf:protoc:$protoc_version"
}
plugins {
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpc_version}" }
grpc { artifact = "io.grpc:protoc-gen-grpc-java:$grpc_version" }
}
generateProtoTasks {
all()*.plugins {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kotlin.code.style=official
annotation_version=1.3.2
coroutines_version=1.3.6
dropwizard_version=4.1.7
dropwizard_version=4.1.8
grpc_version=1.29.0
jcommander_version=1.78
jetty_version=9.4.22.v20191022
Expand All @@ -10,10 +10,10 @@ kluent_version=1.61
ktor_version=1.3.2
logback_version=1.2.3
logging_version=1.7.9
prometheus_version=0.8.1
protoc_version=3.11.4
prometheus_version=0.9.0
protoc_version=3.12.0
serialization_version=0.20.0-1.3.70-eap-274-2
slf4j_version=1.7.28
typesafe_version=1.4.0
utils_version=1.1.16
zipkin_version=5.11.2
zipkin_version=5.12.3
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ 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 @@ -129,6 +130,7 @@ 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: 1 addition & 0 deletions gradlew.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ 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

0 comments on commit 681eadf

Please sign in to comment.