Unverified Commit a6fcd85d authored by Toma's avatar Toma Committed by GitHub
Browse files

keyspersecond: build with gradle_8, remove gradle_7 (#430417)

parents 28e1d89a 59de3a51

pkgs/by-name/ke/keyspersecond/gradleShadowJar.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
diff --git a/build.gradle b/build.gradle

index 6adb040..f442496 100644

--- a/build.gradle

+++ b/build.gradle

@@ -56,8 +56,10 @@ sourceCompatibility = 1.8

 javadoc.options.memberLevel = JavadocMemberLevel.PRIVATE

 group = 'dev.roanh.kps'

 ext.artifact = 'keyspersecond'

-shadowJar.archiveName = 'KeysPerSecond-v' + version + '.jar'

-application.mainClassName = 'dev.roanh.kps.Main'

+shadowJar.archiveBaseName = 'KeysPerSecond'

+shadowJar.archiveVersion = 'v' + version

+shadowJar.archiveClassifier = ''

+application.mainClass = 'dev.roanh.kps.Main'



 test{

 	useJUnitPlatform()

@@ -129,7 +131,7 @@ shadowJar{



 launch4j{

 	jarTask = project.tasks.shadowJar

-	mainClassName = application.mainClassName

+	mainClassName = application.mainClass

 	icon = "${projectDir}/kps.ico"

 	jreMinVersion = project.sourceCompatibility

 	bundledJrePath = "%JAVA_HOME%"

--

pkgs/by-name/ke/keyspersecond/package.nix

+9 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  gradle_7,

  gradle_8,

  copyDesktopItems,

  makeDesktopItem,

  makeWrapper,
@@ -17,7 +17,7 @@ 
}:



let

  gradle = gradle_7;

  gradle = gradle_8;



  libPath = lib.makeLibraryPath [

    # used by the Java2D OpenGL backend
@@ -42,6 +42,13 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-DGpXbCInq+RS56Ae5Y6xzyWqwXAm26c0vOYrFqDvl+8=";

  };



  patches = [

    # deprecated shadowJar.archiveName, application.mainClassName

    # patches already in `master` branch, but no new release yet

    # and would be spread along multiple cherry-picks

    ./gradleShadowJar.patch

  ];



  sourceRoot = "${finalAttrs.src.name}/KeysPerSecond";



  nativeBuildInputs = [