Unverified Commit b61903a0 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #280283 from TomaSajt/ktfmt 

ktfmt: make deterministic
parents ef68542f 9808effe

pkgs/by-name/kt/ktfmt/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -11,14 +11,17 @@ maven.buildMavenPackage rec { 
    hash = "sha256-vdvKHTTD84OAQacv/VE/5BxYdW4n3bxPUHF2MdH+sQQ=";

  };



  mvnHash = "sha256-Cl7P2i4VFJ/yk7700u62YPcacfKkhBztFvcDkYBfZEA=";

  patches = [ ./pin-default-maven-plugin-versions.patch ];



  mvnHash = "sha256-iw28HS0WMFC9BKQKr0v33D77rMQeIMKjXduqPcYU1XA=";



  mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";



  nativeBuildInputs = [ makeWrapper ];



  installPhase = ''

    runHook preInstall



    mkdir -p $out/bin

    install -Dm644 core/target/ktfmt-*-jar-with-dependencies.jar $out/share/ktfmt/ktfmt.jar



    makeWrapper ${jre_headless}/bin/java $out/bin/ktfmt \

pkgs/by-name/kt/ktfmt/pin-default-maven-plugin-versions.patch

0 → 100644
+60 −0
Original line number Diff line number Diff line 
diff --git a/core/pom.xml b/core/pom.xml

index 267689e..6b6e04d 100644

--- a/core/pom.xml

+++ b/core/pom.xml

@@ -34,6 +34,55 @@

         <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>

         <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>

         <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-enforcer-plugin</artifactId>

+                <version>3.4.1</version>

+                <executions>

+                    <execution>

+                        <id>require-all-plugin-versions-to-be-set</id>

+                        <phase>validate</phase>

+                        <goals>

+                            <goal>enforce</goal>

+                        </goals>

+                        <configuration>

+                            <rules>

+                                <requirePluginVersions />

+                            </rules>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>3.2.5</version>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-clean-plugin</artifactId>

+                <version>3.3.2</version>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-install-plugin</artifactId>

+                <version>3.1.1</version>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-site-plugin</artifactId>

+                <version>4.0.0-M13</version>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-resources-plugin</artifactId>

+                <version>3.3.1</version>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-deploy-plugin</artifactId>

+                <version>3.1.1</version>

+            </plugin>

             <plugin>

                 <groupId>org.jetbrains.kotlin</groupId>

                 <artifactId>kotlin-maven-plugin</artifactId>