Skip to content

Commit

Permalink
Upgraded protobuf version for compatibility with recent protoc versio…
Browse files Browse the repository at this point in the history
…ns that are likely to be installed on developers' machines.
  • Loading branch information
mcoblenz committed Mar 31, 2020
1 parent 54c8303 commit 6c9aa3d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .idea/modules/Obsidian.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.1" % "test"
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"

libraryDependencies += "junit" % "junit" % "4.12" % "test"
libraryDependencies += "com.google.protobuf" % "protobuf-java" % "3.5.1"
libraryDependencies += "com.google.protobuf" % "protobuf-java" % "3.11.4"
libraryDependencies += "org.hyperledger.fabric-chaincode-java" % "fabric-chaincode-shim" % "1.4.4"
libraryDependencies += "com.helger" % "jcodemodel" % "3.3.0"
libraryDependencies += "org.apache.commons" % "commons-io" % "1.3.2"
Expand Down
2 changes: 1 addition & 1 deletion buildscript/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:1.4.+'
compile 'org.glassfish:javax.json:1.1.0-M1'
compile 'org.json:json:20171018'
compile 'com.google.protobuf:protobuf-java:3.5.1'
compile 'com.google.protobuf:protobuf-java:3.11.4'
}

version = '1.0'
Expand Down
2 changes: 1 addition & 1 deletion fabric/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ repositories {
dependencies {
implementation 'edu.cmu.cs.obsidian:runtime:0.1'
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.4'
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.5.1'
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.11.4'
testCompile group: 'junit', name: 'junit', version: '4.12'
}

Expand Down

0 comments on commit 6c9aa3d

Please sign in to comment.