From f7adcd4ee556b2c3a420239c13fb74113d791f6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 14 Jul 2024 12:27:14 +0100 Subject: gentoo auto-resync : 14:07:2024 - 12:27:13 --- dev-java/gson/Manifest | 2 +- dev-java/gson/gson-2.11.0-r1.ebuild | 79 +++++++++++++++++++++++++++++++++++++ dev-java/gson/gson-2.11.0.ebuild | 76 ----------------------------------- 3 files changed, 80 insertions(+), 77 deletions(-) create mode 100644 dev-java/gson/gson-2.11.0-r1.ebuild delete mode 100644 dev-java/gson/gson-2.11.0.ebuild (limited to 'dev-java/gson') diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index bc7ea4c08ddd..c20e5c4d6e93 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -3,5 +3,5 @@ DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb7 DIST gson-parent-2.11.0.tar.gz 458360 BLAKE2B 88d242c725b054ac5e7e3ef31f312f77dd03aea29f6604770253564d80f84cd752b43d74dd416785836d08884e462275f8ec924a00e2ffee195c0237bc2bac0b SHA512 1834b7c95f0a40ff1bcf8088f3ffdb8332ae38d452bab4ad2c9271421e75a9236645d1ee0fdb58c2f32eac86cf503afa3de19f08eb422cc91c4d32e370c36eac DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 EBUILD gson-2.10.2_pre20231128-r1.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce -EBUILD gson-2.11.0.ebuild 2046 BLAKE2B 795268cff4ae0b79e20b112d89ac566bbea36d6cbba718916e4ace52e56f4f24806646379a3a0c9dd44399e1d1a7282f0a62b7354b0d098306e1a5b0a963ad6f SHA512 ae34460a08a471c9ab23a8d1065fc7116d746ad9f479d3c541237081c7dea4aad9675952200bb525b07ba3fcfe42572dd3ca54328067c21a331d30aa746925f5 +EBUILD gson-2.11.0-r1.ebuild 2090 BLAKE2B 9ff706735c564cad5b7e8d5f6f3d3f90c5cec4a9a3008bfd2a32a4f10bddbb57b3801846e444a9b25b712f0600a346414bc3254682e21b3bfcfbcff260be1130 SHA512 8fa0e54275e9cc3cbc91cb3f34a6cff983d155900d70d954c87d7549d050f4a41a60dfb237e2e995377bbcdc0ae8731428c54ef5c9ce4ebfe57ddea8af130189 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504 diff --git a/dev-java/gson/gson-2.11.0-r1.ebuild b/dev-java/gson/gson-2.11.0-r1.ebuild new file mode 100644 index 000000000000..fe65dfb3af3d --- /dev/null +++ b/dev-java/gson/gson-2.11.0-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.code.gson:gson:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Gson JSON library" +HOMEPAGE="https://github.com/google/gson" +SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/gson-gson-parent-${PV}/gson" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/error-prone-annotations:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/guava-testlib:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( + ../CHANGELOG.md + ../GsonDesignDocument.md + ../README.md + ../Troubleshooting.md + ../UserGuide.md +) + +PATCHES=( "${FILESDIR}/gson-2.10.2-GsonVersionDiagnosticsTest.patch" ) + +JAVA_CLASSPATH_EXTRA="error-prone-annotations" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-templates" +) + +JAVA_TEST_EXCLUDES=( + # requires the test class to be obfuscated using proguard which we do not have atm + "com.google.gson.functional.EnumWithObfuscatedTest" +) +JAVA_TEST_GENTOO_CLASSPATH=" + guava + guava-testlib + junit-4 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + sed -e "s/\${project.version}/${PV}/g" \ + -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ + || die "Failed to set version" + grep ^Bundle bnd.bnd > src/main/resources/META-INF/MANIFEST.MF || die + echo "Import-Package: sun.misc;resolution:=optional, com.google.gson.annotations" \ + >> src/main/resources/META-INF/MANIFEST.MF || die +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + # src/test/java/com/google/gson/functional/Java17RecordTest.java:78: + # error: records are not supported in -source 11 + JAVAC_ARGS="--source 17 --target 17" java-pkg-simple_src_test +} diff --git a/dev-java/gson/gson-2.11.0.ebuild b/dev-java/gson/gson-2.11.0.ebuild deleted file mode 100644 index dc44f42379f8..000000000000 --- a/dev-java/gson/gson-2.11.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.code.gson:gson:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Gson JSON library" -HOMEPAGE="https://github.com/google/gson" -SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/gson-gson-parent-${PV}/gson" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -DEPEND=" - dev-java/error-prone-annotations:0 - >=virtual/jdk-17:* - test? ( - dev-java/guava:0 - dev-java/guava-testlib:0 - )" -# src/test/java/com/google/gson/functional/Java17RecordTest.java:78: -# error: records are not supported in -source 11 -RDEPEND=">=virtual/jre-17:*" - -DOCS=( - ../CHANGELOG.md - ../GsonDesignDocument.md - ../README.md - ../Troubleshooting.md - ../UserGuide.md -) - -PATCHES=( "${FILESDIR}/gson-2.10.2-GsonVersionDiagnosticsTest.patch" ) - -JAVA_CLASSPATH_EXTRA="error-prone-annotations" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-templates" -) - -JAVA_TEST_EXCLUDES=( - # requires the test class to be obfuscated using proguard which we do not have atm - "com.google.gson.functional.EnumWithObfuscatedTest" -) -JAVA_TEST_GENTOO_CLASSPATH=" - guava - guava-testlib - junit-4 -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - sed -e "s/\${project.version}/${PV}/g" \ - -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ - || die "Failed to set version" - grep ^Bundle bnd.bnd > src/main/resources/META-INF/MANIFEST.MF || die - echo "Import-Package: sun.misc;resolution:=optional, com.google.gson.annotations" \ - >> src/main/resources/META-INF/MANIFEST.MF || die -} - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - java-pkg-simple_src_test -} -- cgit v1.2.3