diff options
Diffstat (limited to 'dev-java/gson')
| -rw-r--r-- | dev-java/gson/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/gson/gson-2.11.0-r2.ebuild (renamed from dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild) | 36 |
2 files changed, 16 insertions, 24 deletions
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 6ea968fede01..614c5483d5ad 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,5 +1,5 @@ AUX gson-2.10.2-GsonVersionDiagnosticsTest.patch 615 BLAKE2B ac75e23e48885403f61cd0b078984a7210576fc2567086a9d9af99a212471cead5d2d5961bb6b7958fb956eda6c348c08124c6e2c6cbc7afac6ff6a36b82a424 SHA512 c363625a645df1a7c3db737db39cc2e163fe4975b6bb51930b805ba359e61509e41397022d689874b6fa100917f6dd936c13c8c6457137f55370b48de35e2bed -DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877 +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-r2.ebuild 2085 BLAKE2B 673cd9ea59b630e2c0fc64aa2dce42f075e086599f47fdb4974fb3a34bc20799f79b75bd5a352b9bc05061e4e4065bd5e24787bc2940012197baf32da6bc30cd SHA512 5cf2bea5ae1721f2da8916e97bc2fc42c9f0646073e6b830a7825099dff62a5a9bd3ae0b6d508b0d3d163d8c35a45d65a9a919dd35360e228410d4c05d2a478f MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504 diff --git a/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild index 4247c08c2190..0284eb26ee8b 100644 --- a/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild +++ b/dev-java/gson/gson-2.11.0-r2.ebuild @@ -11,12 +11,9 @@ 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" -# S="${WORKDIR}/gson-gson-parent-${PV}/gson" -MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5" -SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz +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-${MY_COMMIT}/gson" +S="${WORKDIR}/gson-gson-parent-${PV}/gson" LICENSE="Apache-2.0" SLOT="0" @@ -24,14 +21,14 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" dev-java/error-prone-annotations:0 - >=virtual/jdk-17:* + >=virtual/jdk-11:* 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:*" + ) +" + +RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../CHANGELOG.md @@ -53,9 +50,6 @@ JAVA_SRC_DIR=( JAVA_TEST_EXCLUDES=( # requires the test class to be obfuscated using proguard which we do not have atm "com.google.gson.functional.EnumWithObfuscatedTest" - # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) - # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest - "com.google.gson.regression.OSGiTest" ) JAVA_TEST_GENTOO_CLASSPATH=" guava @@ -71,17 +65,15 @@ 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" -} - -src_compile() { - if ! use test; then - JAVA_PKG_WANT_SOURCE="1.8" - JAVA_PKG_WANT_TARGET="1.8" - fi - java-pkg-simple_src_compile + 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 + + # 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 } |