[Git][java-team/gradle-kotlin-dsl][master] 4 commits: Path relative to the Gradle lib directory in the classpath.properties files
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue Jan 31 12:17:49 GMT 2023
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle-kotlin-dsl
Commits:
5b1a4fea by Emmanuel Bourg at 2023-01-31T09:18:40+01:00
Path relative to the Gradle lib directory in the classpath.properties files
- - - - -
d438d90c by Emmanuel Bourg at 2023-01-31T09:18:40+01:00
Install the Kotlin DSL and dependencies to the Gradle lib directory
- - - - -
25a1a92c by Emmanuel Bourg at 2023-01-31T13:14:35+01:00
Install the Maven poms
- - - - -
880ab049 by Emmanuel Bourg at 2023-01-31T13:14:46+01:00
Upload to unstable
- - - - -
10 changed files:
- debian/changelog
- debian/control
- − debian/libgradle-kotlin-dsl-java.jlibs
- + debian/libgradle-kotlin-dsl-java.links
- + debian/libgradle-kotlin-dsl-java.poms
- + debian/maven.rules
- + debian/poms/gradle-kotlin-dsl-tooling-builders.pom
- + debian/poms/gradle-kotlin-dsl-tooling-models.pom
- + debian/poms/gradle-kotlin-dsl.pom
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+gradle-kotlin-dsl (0.13.2-4) unstable; urgency=medium
+
+ * Path relative to the Gradle lib directory in the classpath.properties files
+ * Install the Kotlin DSL and dependencies to the Gradle lib directory
+ * Install the Maven poms
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 31 Jan 2023 13:14:40 +0100
+
gradle-kotlin-dsl (0.13.2-3) unstable; urgency=medium
* Build the tooling-builders module
=====================================
debian/control
=====================================
@@ -7,8 +7,8 @@ Build-Depends:
debhelper-compat (= 13),
default-jdk,
gradle,
- javahelper,
- kotlin
+ kotlin,
+ maven-repo-helper
Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/gradle-kotlin-dsl.git
Vcs-Browser: https://salsa.debian.org/java-team/gradle-kotlin-dsl
=====================================
debian/libgradle-kotlin-dsl-java.jlibs deleted
=====================================
@@ -1,3 +0,0 @@
-tooling-builders/target/gradle-kotlin-dsl-tooling-builders.jar
-tooling-models/target/gradle-kotlin-dsl-tooling-models.jar
-provider/target/gradle-kotlin-dsl.jar
=====================================
debian/libgradle-kotlin-dsl-java.links
=====================================
@@ -0,0 +1,10 @@
+usr/share/java/gradle-kotlin-dsl.jar usr/share/gradle/lib/gradle-kotlin-dsl.jar
+usr/share/java/gradle-kotlin-dsl-tooling-builders.jar usr/share/gradle/lib/gradle-kotlin-dsl-tooling-builders.jar
+usr/share/java/gradle-kotlin-dsl-tooling-models.jar usr/share/gradle/lib/gradle-kotlin-dsl-tooling-models.jar
+usr/share/java/org.jetbrains.annotations-common.jar usr/share/gradle/lib/annotations-13.0.jar
+usr/share/java/kotlin-compiler-embeddable.jar usr/share/gradle/lib/kotlin-compiler-embeddable.jar
+usr/share/java/kotlin-reflect.jar usr/share/gradle/lib/kotlin-reflect.jar
+usr/share/java/kotlin-sam-with-receiver-compiler-plugin.jar usr/share/gradle/lib/kotlin-sam-with-receiver-compiler-plugin.jar
+usr/share/java/kotlin-stdlib.jar usr/share/gradle/lib/kotlin-stdlib.jar
+usr/share/java/kotlin-stdlib-jdk7.jar usr/share/gradle/lib/kotlin-stdlib-jdk7.jar
+usr/share/java/kotlin-stdlib-jdk8.jar usr/share/gradle/lib/kotlin-stdlib-jdk8.jar
=====================================
debian/libgradle-kotlin-dsl-java.poms
=====================================
@@ -0,0 +1,31 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+
+debian/poms/gradle-kotlin-dsl.pom --java-lib --has-package-version --artifact=provider/target/gradle-kotlin-dsl.jar
+debian/poms/gradle-kotlin-dsl-tooling-builders.pom --java-lib --has-package-version --artifact=tooling-builders/target/gradle-kotlin-dsl-tooling-builders.jar
+debian/poms/gradle-kotlin-dsl-tooling-models.pom --java-lib --has-package-version --artifact=tooling-models/target/gradle-kotlin-dsl-tooling-models.jar
=====================================
debian/maven.rules
=====================================
@@ -0,0 +1 @@
+org.jetbrains.kotlin s/kotlin-stdlib-jre8/kotlin-stdlib-jdk8/ * s/.*/debian/ * *
=====================================
debian/poms/gradle-kotlin-dsl-tooling-builders.pom
=====================================
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.gradle</groupId>
+ <artifactId>gradle-kotlin-dsl-tooling-builders</artifactId>
+ <version>0.13.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.gradle</groupId>
+ <artifactId>gradle-kotlin-dsl</artifactId>
+ <version>0.13.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
=====================================
debian/poms/gradle-kotlin-dsl-tooling-models.pom
=====================================
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.gradle</groupId>
+ <artifactId>gradle-kotlin-dsl-tooling-models</artifactId>
+ <version>0.13.2</version>
+</project>
=====================================
debian/poms/gradle-kotlin-dsl.pom
=====================================
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.gradle</groupId>
+ <artifactId>gradle-kotlin-dsl</artifactId>
+ <version>0.13.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.gradle</groupId>
+ <artifactId>gradle-kotlin-dsl-tooling-models</artifactId>
+ <version>0.13.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-jre8</artifactId>
+ <version>1.1.51</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-reflect</artifactId>
+ <version>1.1.51</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-compiler-embeddable</artifactId>
+ <version>1.1.51</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-sam-with-receiver-compiler-plugin</artifactId>
+ <version>1.1.51</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
=====================================
debian/rules
=====================================
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
+
%:
- dh $@ --with javahelper
+ dh $@ --with maven-repo-helper
override_dh_auto_build:
# gradle-kotlin-dsl-tooling-models
@@ -39,7 +41,7 @@ override_dh_auto_build:
cp -Rp provider/src/main/kotlin/* provider/target/classes
cp -Rp provider/src/main/resources/* provider/target/classes
- echo 'projects=\nruntime=/usr/share/kotlin/kotlinc/lib/annotations-13.0.jar,/usr/share/java/gradle-kotlin-dsl-tooling-models.jar,/usr/share/java/kotlin-compiler-embeddable.jar,/usr/share/java/kotlin-reflect.jar,/usr/share/java/kotlin-sam-with-receiver-compiler-plugin.jar,/usr/share/java/kotlin-stdlib.jar,/usr/share/java/kotlin-stdlib-jdk7.jar,/usr/share/java/kotlin-stdlib-jdk8.jar' \
+ echo 'projects=\nruntime=annotations-13.0.jar,gradle-kotlin-dsl-tooling-models.jar,kotlin-compiler-embeddable.jar,kotlin-reflect.jar,kotlin-sam-with-receiver-compiler-plugin.jar,kotlin-stdlib.jar,kotlin-stdlib-jdk7.jar,kotlin-stdlib-jdk8.jar' \
> provider/target/classes/gradle-kotlin-dsl-classpath.properties
jar cf provider/target/gradle-kotlin-dsl.jar -C provider/target/classes/ .
@@ -64,7 +66,12 @@ override_dh_auto_build:
cp -Rp tooling-builders/src/main/kotlin/* tooling-builders/target/classes
- echo 'projects=\nruntime=/usr/share/java/gradle-kotlin-dsl.jar,/usr/share/java/gradle-kotlin-dsl-tooling-models.jar,/usr/share/java/kotlin-compiler-embeddable.jar,/usr/share/java/kotlin-reflect.jar,/usr/share/java/kotlin-sam-with-receiver-compiler-plugin.jar,/usr/share/java/kotlin-stdlib.jar,/usr/share/java/kotlin-stdlib-jdk7.jar,/usr/share/java/kotlin-stdlib-jdk8.jar,/usr/share/kotlin/kotlinc/lib/annotations-13.0.jar' \
+ echo 'projects=\nruntime=gradle-kotlin-dsl.jar,gradle-kotlin-dsl-tooling-models.jar,kotlin-compiler-embeddable.jar,kotlin-reflect.jar,kotlin-sam-with-receiver-compiler-plugin.jar,kotlin-stdlib.jar,kotlin-stdlib-jdk7.jar,kotlin-stdlib-jdk8.jar,annotations-13.0.jar' \
> tooling-builders/target/classes/gradle-kotlin-dsl-tooling-builders-classpath.properties
jar cf tooling-builders/target/gradle-kotlin-dsl-tooling-builders.jar -C tooling-builders/target/classes .
+
+get-orig-poms:
+ wget https://repo.gradle.org/artifactory/libs-releases-local/org/gradle/gradle-kotlin-dsl/$(DEB_VERSION_UPSTREAM)/gradle-kotlin-dsl-$(DEB_VERSION_UPSTREAM).pom -O debian/poms/gradle-kotlin-dsl.pom
+ wget https://repo.gradle.org/artifactory/libs-releases-local/org/gradle/gradle-kotlin-dsl-tooling-builders/$(DEB_VERSION_UPSTREAM)/gradle-kotlin-dsl-tooling-builders-$(DEB_VERSION_UPSTREAM).pom -O debian/poms/gradle-kotlin-dsl-tooling-builders.pom
+ wget https://repo.gradle.org/artifactory/libs-releases-local/org/gradle/gradle-kotlin-dsl-tooling-models/$(DEB_VERSION_UPSTREAM)/gradle-kotlin-dsl-tooling-models-$(DEB_VERSION_UPSTREAM).pom -O debian/poms/gradle-kotlin-dsl-tooling-models.pom
View it on GitLab: https://salsa.debian.org/java-team/gradle-kotlin-dsl/-/compare/6ae4dc803a07ddad8f136ab89f5141d12c12cade...880ab049871e4dd703740b4f75b7242b536ccc04
--
View it on GitLab: https://salsa.debian.org/java-team/gradle-kotlin-dsl/-/compare/6ae4dc803a07ddad8f136ab89f5141d12c12cade...880ab049871e4dd703740b4f75b7242b536ccc04
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/20230131/2191bf3e/attachment.htm>
More information about the pkg-java-commits
mailing list