[Git][java-team/gradle][emorrp1] WIP missing kotlin-dsl

[emorrp1 (@emorrp1)]

emorrp1 pushed to branch emorrp1 at Debian Java Maintainers / gradle


Commits:
e2099a9a by Phil Morrell at 2022-08-22T11:53:23+01:00
WIP missing kotlin-dsl

- - - - -


4 changed files:

- debian/libgradle-plugins-java.links
- debian/libgradle-plugins-java.poms
- debian/patches/search_system_jar.diff
- debian/rules


Changes:

=====================================
debian/libgradle-plugins-java.links
=====================================
@@ -43,3 +43,4 @@ usr/share/java/gradle-testing-native-${GRADLE_VERSION}.jar        usr/share/grad
 usr/share/java/gradle-tooling-api-builders-${GRADLE_VERSION}.jar  usr/share/gradle/lib/plugins/gradle-tooling-api-builders-${GRADLE_VERSION}.jar
 usr/share/java/gradle-version-control-${GRADLE_VERSION}.jar       usr/share/gradle/lib/plugins/gradle-version-control-${GRADLE_VERSION}.jar
 usr/share/java/gradle-workers-${GRADLE_VERSION}.jar               usr/share/gradle/lib/plugins/gradle-workers-${GRADLE_VERSION}.jar
+usr/share/java/plugins-1.3.5.jar               usr/share/gradle/lib/plugins/plugins-1.3.5.jar


=====================================
debian/libgradle-plugins-java.poms
=====================================
@@ -22,7 +22,7 @@ subprojects/jacoco/build/pom.xml                      --artifact=subprojects/jac
 subprojects/javascript/build/pom.xml                  --artifact=subprojects/javascript/build/libs/*6.4.1.jar                   --java-lib
 subprojects/kotlin-compiler-embeddable/build/pom.xml  --artifact=subprojects/kotlin-compiler-embeddable/build/libs/*6.4.1.jar   --java-lib
 subprojects/kotlin-dsl/build/pom.xml                  --artifact=subprojects/kotlin-dsl/build/libs/*6.4.1.jar                   --java-lib
-subprojects/kotlin-dsl-plugins/build/pom.xml          --artifact=subprojects/kotlin-dsl-plugins/build/libs/*6.4.1.jar           --java-lib
+subprojects/kotlin-dsl-plugins/build/pom.xml          --artifact=subprojects/kotlin-dsl-plugins/build/libs/*6.4.1.jar           --java-lib --set-version=1.3.5 --relocate=org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:1.3.5
 subprojects/kotlin-dsl-provider-plugins/build/pom.xml --artifact=subprojects/kotlin-dsl-provider-plugins/build/libs/*6.4.1.jar  --java-lib
 subprojects/kotlin-dsl-tooling-builders/build/pom.xml --artifact=subprojects/kotlin-dsl-tooling-builders/build/libs/*6.4.1.jar  --java-lib
 subprojects/kotlin-dsl-tooling-models/build/pom.xml   --artifact=subprojects/kotlin-dsl-tooling-models/build/libs/*6.4.1.jar    --java-lib


=====================================
debian/patches/search_system_jar.diff
=====================================
@@ -9,8 +9,8 @@ symlinks in the binary packages may be possible to remove. Maintaining so many
 symlinks is too error prone.
 ---
  .../internal/installation/CurrentGradleInstallationLocator.java   | 8 +-------
- .../java/org/gradle/internal/installation/GradleInstallation.java | 1 +
- 2 files changed, 2 insertions(+), 7 deletions(-)
+ .../java/org/gradle/internal/installation/GradleInstallation.java | 2 ++
+ 2 files changed, 3 insertions(+), 7 deletions(-)
 
 --- a/subprojects/core-api/src/main/java/org/gradle/internal/installation/CurrentGradleInstallationLocator.java
 +++ b/subprojects/core-api/src/main/java/org/gradle/internal/installation/CurrentGradleInstallationLocator.java
@@ -31,11 +31,12 @@ symlinks is too error prone.
      /**
 --- a/subprojects/core-api/src/main/java/org/gradle/internal/installation/GradleInstallation.java
 +++ b/subprojects/core-api/src/main/java/org/gradle/internal/installation/GradleInstallation.java
-@@ -54,6 +54,7 @@ public class GradleInstallation {
+@@ -54,6 +54,8 @@ public class GradleInstallation {
      private static List<File> findLibDirs(File dir) {
          List<File> libDirAndSubdirs = new ArrayList<File>();
          collectWithSubdirectories(new File(dir, "lib"), libDirAndSubdirs);
 +        libDirAndSubdirs.add(new File("/usr/share/java"));
++        libDirAndSubdirs.add(new File("/usr/share/gradle"));
          return libDirAndSubdirs;
      }
  


=====================================
debian/rules
=====================================
@@ -68,6 +68,9 @@ override_dh_auto_clean:
 	dh_auto_clean
 	find . -wholename .*build/generated-resources | xargs echo | sed -e 's^build/generated-resources^build^g' | xargs rm -Rf
 
+#execute_before_dh_strip_nondeterminism:
+#	find subprojects/kotlin-dsl-plugins
+
 # since gradle build-depends on itself, a way to generate a deb from upstream
 # binary distribution is provided with this target. With the resulting .deb,
 # gradle can be rebuilt from source.



View it on GitLab: https://salsa.debian.org/java-team/gradle/-/commit/e2099a9a5bc697e2361497ff1f2c17c1259492b1

-- 
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/commit/e2099a9a5bc697e2361497ff1f2c17c1259492b1
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/20220822/086cbecd/attachment.htm>