浏览代码

Merge pull request #4224 from davido/drop_java_6_support

Drop java 6 support
Feng Xiao 7 年之前
父节点
当前提交
1d02e45468
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      BUILD
  2. 2 2
      java/pom.xml

+ 2 - 2
BUILD

@@ -608,7 +608,7 @@ java_library(
     ]) + [
     ]) + [
         ":gen_well_known_protos_java",
         ":gen_well_known_protos_java",
     ],
     ],
-    javacopts = ["-source 6", "-target 6"],
+    javacopts = ["-source 7", "-target 7"],
     visibility = ["//visibility:public"],
     visibility = ["//visibility:public"],
 )
 )
 
 
@@ -617,7 +617,7 @@ java_library(
     srcs = glob([
     srcs = glob([
         "java/util/src/main/java/com/google/protobuf/util/*.java",
         "java/util/src/main/java/com/google/protobuf/util/*.java",
     ]),
     ]),
-    javacopts = ["-source 6", "-target 6"],
+    javacopts = ["-source 7", "-target 7"],
     visibility = ["//visibility:public"],
     visibility = ["//visibility:public"],
     deps = [
     deps = [
         "protobuf_java",
         "protobuf_java",

+ 2 - 2
java/pom.xml

@@ -96,8 +96,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.6.0</version>
           <version>3.6.0</version>
           <configuration>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>1.7</source>
+            <target>1.7</target>
           </configuration>
           </configuration>
         </plugin>
         </plugin>
         <plugin>
         <plugin>