Update dependencies

sbt · Jul 18, 2019 · e1babe5 · e1babe5
1 parent c500a04
commit e1babe5
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -33,7 +33,7 @@ bintrayReleaseOnPublish := false
 scriptedBufferLog := false
 
 scriptedLaunchOpts += s"-Dplugin.version=${version.value}"
-scriptedLaunchOpts += s"-Dprotoc-jar.version=3.7.1"
+scriptedLaunchOpts += s"-Dprotoc-jar.version=3.8.0"
 
 crossSbtVersions := Seq("0.13.18", "1.2.8")
 

diff --git a/src/main/scala/sbtprotobuf/ProtobufPlugin.scala b/src/main/scala/sbtprotobuf/ProtobufPlugin.scala
@@ -52,7 +52,7 @@ class ScopedProtobufPlugin(configuration: Configuration, private[sbtprotobuf] va
       val protoc = protobufProtoc.value
       args => Process(protoc, args) ! s.log
     },
-    version := "3.7.1",
+    version := "3.9.0",
 
     protobufGeneratedTargets := Nil,
     protobufGeneratedTargets += Tuple2((javaSource in ProtobufConfig).value, "*.java"), // add javaSource to the list of patterns

diff --git a/src/sbt-test/delete/clear-dir/build.sbt b/src/sbt-test/delete/clear-dir/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(ProtobufPlugin)
 
-scalaVersion := "2.10.6"
+scalaVersion := "2.10.7"
 
 protobufRunProtoc in ProtobufConfig := { args =>
   com.github.os72.protocjar.Protoc.runProtoc("-v261" +: args.toArray)

diff --git a/src/sbt-test/delete/single-file/build.sbt b/src/sbt-test/delete/single-file/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(ProtobufPlugin)
 
-scalaVersion := "2.10.6"
+scalaVersion := "2.10.7"
 
 protobufRunProtoc in ProtobufConfig := { args =>
   com.github.os72.protocjar.Protoc.runProtoc("-v261" +: args.toArray)

diff --git a/src/sbt-test/sbt-protobuf/basic/build.sbt b/src/sbt-test/sbt-protobuf/basic/build.sbt
@@ -1,13 +1,13 @@
 enablePlugins(ProtobufPlugin)
 
-scalaVersion := "2.10.6"
+scalaVersion := "2.10.7"
 
-crossScalaVersions += "2.11.11"
+crossScalaVersions += "2.11.12"
 
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % (version in ProtobufConfig).value % ProtobufConfig.name
 
 protobufRunProtoc in ProtobufConfig := { args =>
-  com.github.os72.protocjar.Protoc.runProtoc("-v370" +: args.toArray)
+  com.github.os72.protocjar.Protoc.runProtoc("-v390" +: args.toArray)
 }
 
 excludeFilter in ProtobufConfig := "test1.proto"

diff --git a/src/sbt-test/sbt-protobuf/basic/test b/src/sbt-test/sbt-protobuf/basic/test
@@ -13,7 +13,7 @@ $ exists target/scala-2.10/classes/test/Test2.class
 -$ exists target/scala-2.10/src_managed/main/compiled_protobuf/test/Test2.java
 
 > compile
-> ++ 2.11.11
+> ++ 2.11.12
 > compile
 $ exists target/scala-2.11/src_managed/main/compiled_protobuf/test/Test2.java
 

diff --git a/src/sbt-test/sbt-protobuf/multi-project/build.sbt b/src/sbt-test/sbt-protobuf/multi-project/build.sbt
@@ -1,5 +1,5 @@
 val commonSettings = Seq(
-  scalaVersion := "2.11.11",
+  scalaVersion := "2.11.12",
   protobufRunProtoc in ProtobufConfig := { args =>
     com.github.os72.protocjar.Protoc.runProtoc("-v370" +: args.toArray)
   }

diff --git a/src/sbt-test/sbt-protobuf/protojar/build.sbt b/src/sbt-test/sbt-protobuf/protojar/build.sbt
@@ -2,12 +2,12 @@ enablePlugins(ProtobufPlugin)
 
 version := "0.1.0-SNAPSHOT"
 
-scalaVersion := "2.10.6"
+scalaVersion := "2.10.7"
 
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % (version in ProtobufConfig).value % ProtobufConfig.name
 
 protobufRunProtoc in ProtobufConfig := { args =>
-  com.github.os72.protocjar.Protoc.runProtoc("-v370" +: args.toArray)
+  com.github.os72.protocjar.Protoc.runProtoc("-v390" +: args.toArray)
 }
 
 addArtifact(artifact in (ProtobufConfig, protobufPackage), protobufPackage in ProtobufConfig)

diff --git a/src/sbt-test/sbt-protobuf/task-scoped/build.sbt b/src/sbt-test/sbt-protobuf/task-scoped/build.sbt
@@ -1,8 +1,8 @@
 import sbtprotobuf.ProtobufTestPlugin.{Keys => PBT}
 
-scalaVersion := "2.10.6"
+scalaVersion := "2.10.7"
 
-crossScalaVersions += "2.11.11"
+crossScalaVersions += "2.11.12"
 
 enablePlugins(ProtobufPlugin, ProtobufTestPlugin)
 
@@ -13,7 +13,7 @@ libraryDependencies += "com.google.protobuf" % "protobuf-java" % (version in Pro
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % (version in PBT.ProtobufConfig).value % PBT.ProtobufConfig.name
 
 protobufRunProtoc in ProtobufConfig := { args =>
-  com.github.os72.protocjar.Protoc.runProtoc("-v370" +: args.toArray)
+  com.github.os72.protocjar.Protoc.runProtoc("-v390" +: args.toArray)
 }
 
 PBT.protobufRunProtoc in PBT.ProtobufConfig := (protobufRunProtoc in ProtobufConfig).value

diff --git a/src/sbt-test/sbt-protobuf/task-scoped/test b/src/sbt-test/sbt-protobuf/task-scoped/test
@@ -25,7 +25,7 @@ $ exists target/scala-2.10/classes/test/Test2.class
 -$ exists target/scala-2.10/src_managed/main/compiled_protobuf/test/Test2.java
 
 > compile
-> ++ 2.11.11
+> ++ 2.11.12
 > compile
 $ exists target/scala-2.11/src_managed/main/compiled_protobuf/test/Test2.java