[Git][clojure-team/cheshire-clojure][debian/main] 3 commits: Use -source and -target values from java-common

[Jérôme Charaoui (@lavamind)]

Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / cheshire-clojure


Commits:
4624010c by Pushkar Kulkarni at 2023-11-23T19:22:13+05:30
Use -source and -target values from java-common

- - - - -
e840e835 by Jérôme Charaoui at 2024-08-28T19:03:52+00:00
Resolve conflict in d/changelog
- - - - -
a3fe25a9 by Jérôme Charaoui at 2024-08-28T19:16:47+00:00
Merge branch 'fix-1053016' into 'debian/main'

Use -source and -target values from java-common

See merge request clojure-team/cheshire-clojure!2
- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0003-compile-with-jdk-21.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,12 @@
-cheshire-clojure (5.11.0-3) unstable; urgency=medium
+cheshire-clojure (5.11.0-3) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Pushkar Kulkarni ]
+  * d/rules: Use javac -source/-target values from java-common (Closes: #1053016)
+  * Modify project.clj to read -source/-target from the environment
+
+  [ Louis-Philippe Véronneau ]
   * d/patches/0001: explicitly add clojure to fix dependency resolution issue.
     (Closes: #1073377)
 


=====================================
debian/patches/0003-compile-with-jdk-21.patch
=====================================
@@ -0,0 +1,9 @@
+--- a/project.clj
++++ b/project.clj
+@@ -39,5 +39,5 @@
+ ;;             "-XX:+UnlockDiagnosticVMOptions"
+ ;;             "-XX:+PrintInlining"
+              ]
+-  :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]
++  :javac-options ["-target" ~(System/getenv, "JAVA_TARGET_VERSION") "-source" ~(System/getenv, "JAVA_SOURCE_VERSION") "-Xlint:-options"]
+   :local-repo "debian/maven-repo")


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 0001-Lein-Local.patch
 0002-Skip-failing-test.generative-testcase.patch
+0003-compile-with-jdk-21.patch


=====================================
debian/rules
=====================================
@@ -2,6 +2,7 @@
 
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/javahelper/java-vars.mk
+include /usr/share/java/java_defaults.mk
 
 export LEIN_HOME=$(CURDIR)/.lein
 export LEIN_OFFLINE=true
@@ -15,7 +16,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	lein pom debian/pom.xml
-	lein jar
+	JAVA_SOURCE_VERSION=$(java_compat_level) JAVA_TARGET_VERSION=$(java_compat_level) lein jar
 	# symlinks so we don't need a version in debian/*.poms
 	cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
 



View it on GitLab: https://salsa.debian.org/clojure-team/cheshire-clojure/-/compare/82184fbf2d0e7d707acecd279a55485f66b43d25...a3fe25a9a5b037b28792b2668e96c108a5a4d15c

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/cheshire-clojure/-/compare/82184fbf2d0e7d707acecd279a55485f66b43d25...a3fe25a9a5b037b28792b2668e96c108a5a4d15c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240828/3d1c7410/attachment.htm>