Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Commit

Permalink
Update to latest protobuf 3.0.0-beta-3 (#9)
Browse files Browse the repository at this point in the history
* Update to latest protobuf 3.0.0-beta-3

* Disable signing until it can be made truly conditional
  • Loading branch information
Brian J. Watson authored and guptasu committed Jul 1, 2016
1 parent 4f850c2 commit 1b0ec38
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 37 deletions.
15 changes: 5 additions & 10 deletions build.gradle
Expand Up @@ -4,15 +4,10 @@
buildscript {
repositories {
mavenLocal()
maven {
// For 0.7.2-SNAPSHOT of gradle protobuf plugin. This should
// be removed once 0.7.2 becomes released.
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
mavenCentral()
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.2-SNAPSHOT'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
}
}

Expand Down Expand Up @@ -61,7 +56,7 @@ ext {
snakeyaml: 'org.yaml:snakeyaml:1.16',
swaggerModel: 'io.swagger:swagger-models:1.5.4',
swaggerParser: 'io.swagger:swagger-parser:1.0.11',
grpcCore: 'com.google.api.grpc:grpc-core-proto:0.0.4',
grpcCore: 'com.google.api.grpc:grpc-core-proto:0.0.5',
apacheCommonCli: 'commons-cli:commons-cli:1.2',
jsonSchemaValidator: 'com.github.fge:json-schema-validator:2.0.0',

Expand All @@ -72,9 +67,9 @@ ext {
jodaTime: 'joda-time:joda-time:2.9',

// Protobuf
protobuf: 'com.google.protobuf:protobuf-java:3.0.0-beta-1',
protobufUtil: 'com.google.protobuf:protobuf-java-util:3.0.0-beta-2',
protoc: 'com.google.protobuf:protoc:3.0.0-beta-1'
protobuf: 'com.google.protobuf:protobuf-java:3.0.0-beta-3',
protobufUtil: 'com.google.protobuf:protobuf-java-util:3.0.0-beta-3',
protoc: 'com.google.protobuf:protoc:3.0.0-beta-3'
]
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sat Oct 24 14:14:57 PDT 2015
#Thu Jun 30 17:54:26 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
46 changes: 25 additions & 21 deletions gradlew
Expand Up @@ -6,12 +6,30 @@
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-

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

# Determine the Java command to use to start the JVM.
Expand All @@ -85,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
Expand Down
8 changes: 4 additions & 4 deletions gradlew.bat
Expand Up @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@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=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@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=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

Expand Down Expand Up @@ -46,7 +46,7 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
Expand Down

0 comments on commit 1b0ec38

Please sign in to comment.