Fix errors
diff --git a/java/kotlin/generate-sources-build.xml b/java/kotlin/generate-sources-build.xml index 6963f37..b78bc0b 100644 --- a/java/kotlin/generate-sources-build.xml +++ b/java/kotlin/generate-sources-build.xml
@@ -3,6 +3,7 @@ <mkdir dir="${generated.sources.dir}"/> <exec executable="${protoc}"> <arg value="--kotlin_out=${generated.sources.dir}"/> + <arg value="--java_out=${generated.sources.dir}"/> <arg value="--proto_path=${protobuf.source.dir}"/> <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/> <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index 27b8bee..7e2caa3 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl
@@ -70,9 +70,9 @@ if not native.existing_rule("rules_jvm_external"): http_archive( name = "rules_jvm_external", - sha256 = "744bd7436f63af7e9872948773b8b106016dc164acb3960b4963f86754532ee7", - strip_prefix = "rules_jvm_external-906875b0d5eaaf61a8ca2c9c3835bde6f435d011", - urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/906875b0d5eaaf61a8ca2c9c3835bde6f435d011.zip"], + sha256 = "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140", + strip_prefix = "rules_jvm_external-4.1", + urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/4.1.zip"], ) if not native.existing_rule("rules_pkg"):
diff --git a/protoc-artifacts/Dockerfile b/protoc-artifacts/Dockerfile index 4bc88dd..278bc74 100644 --- a/protoc-artifacts/Dockerfile +++ b/protoc-artifacts/Dockerfile
@@ -1,7 +1,6 @@ -FROM centos:7 +FROM centos:6.9 -RUN yum install -y gcc \ - git \ +RUN yum install -y git \ tar \ wget \ make \ @@ -29,6 +28,13 @@ tar xz -C /var/local ENV PATH /var/local/apache-maven-3.3.9/bin:$PATH +# Install GCC 4.8 to support -static-libstdc++ +RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -P /etc/yum.repos.d && \ + bash -c 'echo "enabled=1" >> /etc/yum.repos.d/devtools-2.repo' && \ + bash -c "sed -e 's/\$basearch/i386/g' /etc/yum.repos.d/devtools-2.repo > /etc/yum.repos.d/devtools-i386-2.repo" && \ + sed -e 's/testing-/testing-i386-/g' -i /etc/yum.repos.d/devtools-i386-2.repo && \ + rpm --rebuilddb + RUN yum install -y devtoolset-2-gcc \ devtoolset-2-gcc-c++ \ devtoolset-2-binutils \
diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc index 6c45f98..3f27c59 100644 --- a/src/google/protobuf/compiler/java/java_message.cc +++ b/src/google/protobuf/compiler/java/java_message.cc
@@ -1526,7 +1526,7 @@ printer->Print( "@Suppress(\"UNCHECKED_CAST\")\n" "@kotlin.jvm.JvmSynthetic\n" - "public operator fun <T : Any> get(extension: " + "public operator fun <T : kotlin.Any> get(extension: " "com.google.protobuf.ExtensionLite<$message$, T>): T {\n" " return if (extension.isRepeated) {\n" " get(extension as com.google.protobuf.ExtensionLite<$message$, " @@ -1542,7 +1542,7 @@ "@kotlin.OptIn" "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n" "@kotlin.jvm.JvmName(\"-getRepeatedExtension\")\n" - "public operator fun <E : Any> get(\n" + "public operator fun <E : kotlin.Any> get(\n" " extension: com.google.protobuf.ExtensionLite<$message$, List<E>>\n" "): com.google.protobuf.kotlin.ExtensionList<E, $message$> {\n" " return com.google.protobuf.kotlin.ExtensionList(extension, " @@ -1571,7 +1571,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" "@kotlin.PublishedApi\n" - "internal fun <T : Any> setExtension(extension: " + "internal fun <T : kotlin.Any> setExtension(extension: " "com.google.protobuf.ExtensionLite<$message$, T>, " "value: T) {\n" " _builder.setExtension(extension, value)\n" @@ -1585,7 +1585,7 @@ " extension: com.google.protobuf.ExtensionLite<$message$, T>,\n" " value: T\n" ") {\n" - " setExtension(extension, value!!)\n" + " setExtension(extension, value)\n" "}\n\n", "message", message_name); @@ -1597,7 +1597,7 @@ "com.google.protobuf.ByteString>,\n" " value: com.google.protobuf.ByteString\n" ") {\n" - " setExtension(extension, value!!)\n" + " setExtension(extension, value)\n" "}\n\n", "message", message_name); @@ -1608,13 +1608,13 @@ " extension: com.google.protobuf.ExtensionLite<$message$, T>,\n" " value: T\n" ") {\n" - " setExtension(extension, value!!)\n" + " setExtension(extension, value)\n" "}\n\n", "message", message_name); printer->Print( "@kotlin.jvm.JvmSynthetic\n" - "public fun <E : Any> com.google.protobuf.kotlin.ExtensionList<E, " + "public fun <E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.add(value: E) {\n" " _builder.addExtension(this.extension, value)\n" "}\n\n", @@ -1623,7 +1623,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" "@Suppress(\"NOTHING_TO_INLINE\")\n" - "public inline operator fun <E : Any> " + "public inline operator fun <E : kotlin.Any> " "com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.plusAssign" "(value: E) {\n" @@ -1633,7 +1633,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" - "public fun <E : Any> com.google.protobuf.kotlin.ExtensionList<E, " + "public fun <E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.addAll(values: Iterable<E>) {\n" " for (value in values) {\n" " add(value)\n" @@ -1644,7 +1644,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" "@Suppress(\"NOTHING_TO_INLINE\")\n" - "public inline operator fun <E : Any> " + "public inline operator fun <E : kotlin.Any> " "com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.plusAssign(values: " "Iterable<E>) {\n" @@ -1654,7 +1654,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" - "public operator fun <E : Any> " + "public operator fun <E : kotlin.Any> " "com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.set(index: Int, value: " "E) {\n"
diff --git a/src/google/protobuf/compiler/java/java_message_lite.cc b/src/google/protobuf/compiler/java/java_message_lite.cc index dd32c26..0fc9fd0 100644 --- a/src/google/protobuf/compiler/java/java_message_lite.cc +++ b/src/google/protobuf/compiler/java/java_message_lite.cc
@@ -847,7 +847,7 @@ printer->Print( "@Suppress(\"UNCHECKED_CAST\")\n" "@kotlin.jvm.JvmSynthetic\n" - "public operator fun <T : Any> get(extension: " + "public operator fun <T : kotlin.Any> get(extension: " "com.google.protobuf.ExtensionLite<$message$, T>): T {\n" " return if (extension.isRepeated) {\n" " get(extension as com.google.protobuf.ExtensionLite<$message$, " @@ -863,7 +863,7 @@ "@kotlin.OptIn" "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n" "@kotlin.jvm.JvmName(\"-getRepeatedExtension\")\n" - "public operator fun <E : Any> get(\n" + "public operator fun <E : kotlin.Any> get(\n" " extension: com.google.protobuf.ExtensionLite<$message$, List<E>>\n" "): com.google.protobuf.kotlin.ExtensionList<E, $message$> {\n" " return com.google.protobuf.kotlin.ExtensionList(extension, " @@ -892,7 +892,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" "@kotlin.PublishedApi\n" - "internal fun <T : Any> setExtension(extension: " + "internal fun <T : kotlin.Any> setExtension(extension: " "com.google.protobuf.ExtensionLite<$message$, T>, " "value: T) {\n" " _builder.setExtension(extension, value)\n" @@ -935,7 +935,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" - "public fun<E : Any> com.google.protobuf.kotlin.ExtensionList<E, " + "public fun<E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.add(value: E) {\n" " _builder.addExtension(this.extension, value)\n" "}\n\n", @@ -944,7 +944,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" "@Suppress(\"NOTHING_TO_INLINE\")\n" - "public inline operator fun <E : Any> " + "public inline operator fun <E : kotlin.Any> " "com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.plusAssign" "(value: E) {\n" @@ -954,7 +954,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" - "public fun<E : Any> com.google.protobuf.kotlin.ExtensionList<E, " + "public fun<E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.addAll(values: Iterable<E>) {\n" " for (value in values) {\n" " add(value)\n" @@ -965,7 +965,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" "@Suppress(\"NOTHING_TO_INLINE\")\n" - "public inline operator fun <E : Any> " + "public inline operator fun <E : kotlin.Any> " "com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.plusAssign(values: " "Iterable<E>) {\n" @@ -975,7 +975,7 @@ printer->Print( "@kotlin.jvm.JvmSynthetic\n" - "public operator fun <E : Any> " + "public operator fun <E : kotlin.Any> " "com.google.protobuf.kotlin.ExtensionList<E, " "$message$>.set(index: Int, value: " "E) {\n"