OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=9

google-guice-throwingproviderbinder.patch

@@ -1,11 +1,33 @@
---- google-guice-4.1/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java	2019-04-03 09:27:26.000000000 +0200
+--- google-guice-4.1/common.xml	2021-06-10 12:08:42.237189651 +0200
-+++ google-guice-4.1/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java	2021-05-11 14:44:01.099881499 +0200
++++ google-guice-4.1/common.xml	2021-06-10 12:10:20.765834983 +0200
-@@ -565,5 +565,8 @@
+@@ -14,7 +14,7 @@
-     @Override public boolean apply(Method input) {
+     <javac srcdir="${src.dir}"
-       return !input.isBridge() && !input.isSynthetic();
+          debug="on"
-     }
+          destdir="${build.dir}/classes"
-+    @Override public boolean test(Method input) {
+-         source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false">
-+      return apply(input);
++         source="1.8" target="1.8" encoding="UTF-8" includeantruntime="false">
-+    }
+       <compilerarg value="-Xlint:all,-serial"/>
-   }
+       <classpath refid="compile.classpath"/>
- }
+     </javac>
+@@ -39,7 +39,7 @@
+     <property name="Bundle-DocURL" value="https://github.com/google/guice"/>
+     <property name="Bundle-Copyright" value="Copyright (C) 2006 Google Inc."/>
+     <property name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+-    <property name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6"/>
++    <property name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.8"/>
+     <property name="Bundle-Vendor" value="Google, Inc."/>
+ 
+     <property name="Export-Package" value="!${module}.internal.*,${module}.*;version=${api.version}"/>
+@@ -82,7 +82,7 @@
+     <javac srcdir="${test.dir}"
+          debug="on"
+          destdir="${build.dir}/test"
+-         source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false">
++         source="1.8" target="1.8" encoding="UTF-8" includeantruntime="false">
+       <classpath path="${build.dir}/classes"/>
+       <classpath path="${build.dir}/test"/>
+       <classpath refid="compile.classpath"/>
+Only in google-guice-4.1/core: pom.xml.orig
+Only in google-guice-4.1/extensions: pom.xml.orig
+Only in google-guice-4.1/jdk8-tests: pom.xml.orig
+Only in google-guice-4.1: pom.xml.orig

google-guice.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun 10 10:16:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patches:
+  * google-guice-throwingproviderbinder.patch
+    + do not add the override of virtual function
+	+ build with source/target 8 so that the default override
+      from the interface can be used
+  * guice-4.1-javadoc.patch
+    + build javadoc with source level 8
+
 -------------------------------------------------------------------
 Tue May 11 12:46:28 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 

google-guice.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package google-guice
+# spec file
 #
 # Copyright (c) 2021 SUSE LLC
 #

guice-4.1-javadoc.patch

@@ -6,7 +6,7 @@ diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml
      <javadoc packagenames="com.google.*"
               docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
 -             maxmemory="1024M"
-+             maxmemory="1024M" source="1.6" encoding="UTF-8"
++             maxmemory="1024M" source="1.8" encoding="UTF-8"
               classpathref="javadoc.classpath">
        <fileset dir="${src.dir}" defaultexcludes="yes">
          <include name="com/google/**"/>
@@ -15,7 +15,7 @@ diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml
               destdir="${jdiff.tmp}"
               docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
 -             maxmemory="512M"
-+             maxmemory="512M" source="1.6" encoding="UTF-8"
++             maxmemory="512M" source="1.8" encoding="UTF-8"
               sourcefiles="${jdiff.home}/Null.java"
               classpathref="javadoc.classpath">
        <doclet name="jdiff.JDiff">
@@ -24,7 +24,7 @@ diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml
      <javadoc packagenames="com.google.*"
               destdir="build/docs/javadoc"
 -             maxmemory="512M"
-+             maxmemory="512M" source="1.6" encoding="UTF-8"
++             maxmemory="512M" source="1.8" encoding="UTF-8"
               classpathref="javadoc.classpath"
 -             additionalparam="-Xdoclint:none -notimestamp"
 +             additionalparam="-notimestamp"