Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sbt-launcher for openSUSE:Factory checked in at 2022-03-29 21:07:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbt-launcher (Old) and /work/SRC/openSUSE:Factory/.sbt-launcher.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbt-launcher" Tue Mar 29 21:07:02 2022 rev:2 rq:965694 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sbt-launcher/sbt-launcher.changes 2019-12-10 22:41:43.937824495 +0100 +++ /work/SRC/openSUSE:Factory/.sbt-launcher.new.1900/sbt-launcher.changes 2022-03-29 21:07:19.065133285 +0200 @@ -1,0 +2,8 @@ +Sat Mar 19 17:08:21 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Build with source/target levels 8 +- Added patch: + * launcher-ivy.patch + + fix build against ivy 2.5.0 + +------------------------------------------------------------------- New: ---- launcher-ivy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbt-launcher.spec ++++++ --- /var/tmp/diff_new_pack.M8v3u3/_old 2022-03-29 21:07:19.517133676 +0200 +++ /var/tmp/diff_new_pack.M8v3u3/_new 2022-03-29 21:07:19.521133680 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sbt-launcher +# spec file # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source1: http://central.maven.org/maven2/org/scala-sbt/%{short_name}-interface/%{version}/%{short_name}-interface-%{version}.pom # Generated offline by sbt make-pom and cleaned up Source2: %{short_name}-implementation.pom +Patch0: launcher-ivy.patch BuildRequires: apache-ivy BuildRequires: fdupes BuildRequires: javapackages-local @@ -55,17 +56,18 @@ %prep %setup -q -n %{short_name}-%{version} +%patch0 -p1 %build pushd %{short_name}-interface cp %{SOURCE1} pom.xml # jar mkdir -p target/classes - javac -d target/classes -source 6 -target 6 $(find src/main -name \*.java | xargs) + javac -d target/classes -source 8 -target 8 $(find src/main -name \*.java | xargs) jar -cf target/%{short_name}-interface-%{version}.jar -C target/classes . # javadoc mkdir -p target/site/apidocs - javadoc -d target/site/apidocs -source 6 -notimestamp $(find src/main -name \*.java | xargs) + javadoc -d target/site/apidocs -source 8 -notimestamp $(find src/main -name \*.java | xargs) popd %{mvn_artifact} %{short_name}-interface/pom.xml %{short_name}-interface/target/%{short_name}-interface-%{version}.jar pushd %{short_name}-implementation ++++++ launcher-ivy.patch ++++++ --- launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelResolveEngine.scala 2022-03-19 17:35:29.562544280 +0100 +++ launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelResolveEngine.scala 2022-03-19 17:46:58.730677371 +0100 @@ -34,7 +34,7 @@ override def downloadArtifacts( report: ResolveReport, - artifactFilter: Filter, + artifactFilter: Filter[Artifact], options: DownloadOptions ): Unit = { import scala.collection.JavaConverters._ @@ -85,7 +85,7 @@ */ private def downloadNodeArtifacts( dependency: IvyNode, - artifactFilter: Filter, + artifactFilter: Filter[Artifact], options: DownloadOptions ): DownloadResult = { --- launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelRetrieveEngine.scala 2022-03-19 17:35:29.562544280 +0100 +++ launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelRetrieveEngine.scala 2022-03-19 17:45:59.218320985 +0100 @@ -167,7 +167,7 @@ if (options.isMakeSymlinks()) { var symlinkCreated = false try { - FileUtil.symlink(archive, destFile, null, true) + FileUtil.symlink(archive, destFile, true) symlinkCreated = true } catch { case ioe: IOException => --- launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/Update.scala 2022-03-19 17:35:29.562544280 +0100 +++ launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/Update.scala 2022-03-19 18:04:13.840880157 +0100 @@ -187,7 +187,7 @@ private def excludeRule(organization: String, name: String): ExcludeRule = { val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*") - val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[AnyRef, AnyRef]) + val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[String, String]) rule.addConfiguration(DefaultIvyConfiguration) rule } @@ -233,8 +233,8 @@ problem.printStackTrace(logWriter) } } - private final class ArtifactFilter(f: IArtifact => Boolean) extends Filter { - def accept(o: Any) = o match { case a: IArtifact => f(a); case _ => false } + private final class ArtifactFilter(f: IArtifact => Boolean) extends Filter[IArtifact] { + def accept(o: IArtifact) = o match { case a: IArtifact => f(a); case _ => false } } /** Retrieves resolved dependencies using the given target to determine the location to retrieve to. */ private def retrieve(eventManager: EventManager, module: ModuleDescriptor, target: UpdateTarget, autoScalaVersion: Option[String]): Unit = {
