Skip to content

Commit

Permalink
Merge pull request #137 from VariantSync/fix-functjonal-build
Browse files Browse the repository at this point in the history
Upgrade to Java 17
  • Loading branch information
pmbittner authored Mar 14, 2024
2 parents ea543be + 80ba6e0 commit aa3f638
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 23 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pkgs.stdenv.mkDerivation rec {
dontConfigure = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-NFV5zcNefpaOoPIGEga/jlyuWzCV+OidOCs2SQuEDkA=";
outputHash = "sha256-Gimt6L54yyaX3BtdhQlVu1j4c4y++Mip0GzMl/IfzMc=";
};

buildPhase = ''
Expand Down
6 changes: 4 additions & 2 deletions local-maven-repo/deploy-functjonal.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# A simple script for deploying an update of the functjonal library to the local maven repository
# The script takes a single argument, the path to the functjonal jar file to deploy
# A simple script for deploying an update of the functjonal library to the local maven repository.
# The script takes a single argument, the path to the functjonal jar file to deploy.
# To update the repository, you may delete directory 'org/variantsync/functjonal'.
# Then run this script.
mvn deploy:deploy-file -DgroupId=org.variantsync -DartifactId=functjonal -Dversion=1.0-SNAPSHOT -Durl=file:../local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=$1
rm -rf ~/.m2/repository/org/variantsync/functjonal/
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
515896799f2772406fcbd651bd235ca6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a9716d5cf8d8e80a1a24beee900ee2e3c33abb05
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<metadata modelVersion="1.1.0">
<groupId>org.variantsync</groupId>
<artifactId>functjonal</artifactId>
<version>1.0-SNAPSHOT</version>
<versioning>
<lastUpdated>20240314134555</lastUpdated>
<snapshot>
<timestamp>20240129.202737</timestamp>
<timestamp>20240314.134555</timestamp>
<buildNumber>1</buildNumber>
</snapshot>
<lastUpdated>20240129202737</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>1.0-20240129.202737-1</value>
<updated>20240129202737</updated>
<value>1.0-20240314.134555-1</value>
<updated>20240314134555</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>1.0-20240129.202737-1</value>
<updated>20240129202737</updated>
<value>1.0-20240314.134555-1</value>
<updated>20240314134555</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
<version>1.0-SNAPSHOT</version>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4b9f85e1bef56d44ad486a3fd8549651
fb3ae7e8531f6f3509d9eecaa9a13976
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d99567e1fcadb151e7d9ae963a5869765814c543
f4f4f846a7708cd34504a007f06e7b3a23172d11
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>1.0-SNAPSHOT</version>
</versions>
<lastUpdated>20240129202737</lastUpdated>
<lastUpdated>20240314134555</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0da08c792ab83a9e492b8f4ece644a2f
ed2cee329da9c79511a0693ff503029c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1deddb596cf40592f4a9f2a3ac15b55556ae0f0f
f5e82421d37a23549abd2bb782324a0d4cbcf0b6
8 changes: 2 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<build>
Expand All @@ -31,10 +31,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>16</source>
<target>16</target>
</configuration>
</plugin>

<plugin>
Expand Down

0 comments on commit aa3f638

Please sign in to comment.