From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 15 21:26:31 2021 Received: (at 47789) by debbugs.gnu.org; 16 Apr 2021 01:26:31 +0000 Received: from localhost ([127.0.0.1]:39635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXDFe-0008Pu-TL for submit@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXDFb-0008PF-Ct for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47747) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXDFW-00030I-6B for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:22 -0400 Received: from localhost ([::1]:39222 helo=mikegerwitz-pc) by fencepost.gnu.org with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lXDFS-0000Zy-IF for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:21 -0400 From: Mike Gerwitz To: 47789@debbugs.gnu.org Subject: [PATCH 1/6] gnu: Add java-gson-2.8.6. In-Reply-To: Date: Thu, 15 Apr 2021 21:23:42 -0400 References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) X-From-Line: 3f7bbd67919d869d70b267f8fd8d8edb90d59b65 Mon Sep 17 00:00:00 2001 Message-Id: <3f7bbd67919d869d70b267f8fd8d8edb90d59b65.1618536137.git.mtg@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47789 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable This introduces a new package rather than upgrading the exist java-gson package because it is built using OpenJDK11; I didn't want to have to propagate that JDK dependency to the other packages that use it. OpenJDK 11 was chosen becuase this dependency was introduced for tla2tools. * gnu/packages/java.scm (java-gson-2.8.6): New variable. =2D-- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 207f136513..62f684a74c 100644 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -15,6 +15,7 @@ ;;; Copyright =C2=A9 2020 Raghav Gururajan ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Vincent Legoll +;;; Copyright =C2=A9 2021 Mike Gerwitz ;;; ;;; This file is part of GNU Guix. ;;; @@ -11724,6 +11725,37 @@ string to an equivalent Java object. Gson can wor= k with arbitrary Java objects including pre-existing objects that you do not have source-code of.") (license license:asl2.0))) =20 +;; This requires a different Java version than 2.8.2 above +(define-public java-gson-2.8.6 + (package + (inherit java-gson) + (name "java-gson") + (version "2.8.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/gson") + (commit (string-append "gson-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kk5p3vichdb0ph1lzknrcpbklgnmq455mngmjpxvvj29p3rgpk3")))) + (arguments + `(#:jar-name "gson.jar" + #:jdk ,openjdk11 + #:source-dir "gson/src/main/java" + #:test-dir "gson/src/test" + #:phases + (modify-phases %standard-phases + ;; avoid Maven dependency + (add-before 'build 'fill-template + (lambda _ + (with-directory-excursion "gson/src/main" + (copy-file "java-templates/com/google/gson/internal/GsonBui= ldConfig.java" + "java/com/google/gson/internal/GsonBuildConfig.j= ava") + (substitute* "java/com/google/gson/internal/GsonBuildConfig= .java" + (("\\$\\{project.version\\}") ,version)))))))))) + (define-public java-hawtjni (package (name "java-hawtjni") =2D-=20 Mike Gerwitz Activist For User Freedom | GNU Maintainer & Volunteer GPG: D6E9 B930 028A 6C38 F43B 2388 FEF6 3574 5E6F 6D05 https://mikegerwitz.com --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEtyLNo03iHAANpWtgjJF7f13FG6IFAmB45yEACgkQjJF7f13F G6LILA/8CGmJjPoz8oqxLwievO5/47umEbVNxJEQWl+O9HEYcodUrocXAU0ft8fL VhiOC+2cksTog4NfpMDrn0GfN7+t1o2R144xyYsJHkjJyuAHDj9Y0QRII+Tt7bBk MDC87YvgGEqD8zbF3B1xdZ+v5IBUJ7E+gCfizrntVBId/g4NgeEplXMjBHBQXNXY /Vp1loYzEmaoFMwBo/ZHY0RxEm1/2Hcv3PeDOxjNVfP9s0ANiGx3Ck6atTAennwn Ma6lJWzwLNPeCJXHXR04q4SXFIyBSPPm3Ii6nJ/oseTQ4O41qmlx/scQmTwDFRds KDGRdvqKbQ42eGZxnJWjN9MKkEHEHQAWlptkIa/ga8D4Int6zL/sm1IR4hbbGEjT uioQYEz99DwU9RH27XnJaYdB8qB9M9dxkPCBLfDvC6K0Oe/U14zNvSNwrl7s4dbB 6/bGAg1bvvZDABs5Aii4bUbK4OX6o1Icpv/NvYoo2V80eRS7UPpvmNX2mpiVNFea 3/h0fXbbS5uF+xsfmOJsPtl/D9zG6DG+ZGsLzsMhgmOmm9lwsKcwisSN3tjg4rVK KKaSPA975tt5u38hg56xlFrqKgJxHcPYDawUv+p5BB2TIDFxZGj2xMQI3fb2Keau IjtQEIcoUurIoZH31mbETiuqy7B+05b7XUMmO7aZfgKNfX1BgVA= =xF35 -----END PGP SIGNATURE----- --=-=-=--