nexoniarz/NexoPass
Watch
1
0
Fork
You've already forked NexoPass
 0
mirror of https://github.com/Nexoniarz/NexoPass.git synced 2026-11-03 04:24:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the single-jar Linux build: drop Bouncy Castle signature files

Browse source 
Merged into one jar their signatures no longer match and Java refused to start.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Nexoniarz 2026-10-08 15:13:12 +02:00
commit 94d43ce77a
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-java@v4 - uses: actions/setup-java@v5
with: { distribution: temurin, java-version: 17 } with: { distribution: temurin, java-version: 17 }
- uses: gradle/actions/setup-gradle@v4 - uses: gradle/actions/setup-gradle@v4
- name: Version from tag - name: Version from tag
@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-java@v4 - uses: actions/setup-java@v5
with: { distribution: temurin, java-version: 17 } with: { distribution: temurin, java-version: 17 }
- uses: gradle/actions/setup-gradle@v4 - uses: gradle/actions/setup-gradle@v4
- run: sudo apt-get update && sudo apt-get install -y rpm - run: sudo apt-get update && sudo apt-get install -y rpm
@ -78,7 +78,7 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-java@v4 - uses: actions/setup-java@v5
with: { distribution: temurin, java-version: 17 } with: { distribution: temurin, java-version: 17 }
- uses: gradle/actions/setup-gradle@v4 - uses: gradle/actions/setup-gradle@v4
- name: Version from tag - name: Version from tag

2
build.gradle.kts
View file

@ -7,5 +7,5 @@ plugins {
} }
// One version for every app; CI passes -PappVersion=X.Y.Z from the git tag. // One version for every app; CI passes -PappVersion=X.Y.Z from the git tag.
val appVersion = (findProperty("appVersion") as String?) ?: "1.3.0" val appVersion = (findProperty("appVersion") as String?) ?: "1.3.1"
extra["appVersion"] = appVersion extra["appVersion"] = appVersion

6
desktop/build.gradle.kts
View file

@ -76,3 +76,9 @@ compose.desktop {
buildTypes.release.proguard { isEnabled.set(false) } buildTypes.release.proguard { isEnabled.set(false) }
} }
} }
// Bouncy Castle jars are signed; merged into one jar those signatures no
// longer match and Java refuses to start. The single jar doesn't need them.
tasks.matching { it.name.startsWith("packageUberJar") || it.name.startsWith("packageReleaseUberJar") }.configureEach {
(this as org.gradle.jvm.tasks.Jar).exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "META-INF/*.EC")
}

2
shared/src/com/nexoniarz/nexopass/ui/SettingsScreen.kt
View file

@ -27,7 +27,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.time.LocalDate import java.time.LocalDate
const val APP_VERSION = "1.3.0" const val APP_VERSION = "1.3.1"
private fun bioLabel(mode: String) = when (mode) { private fun bioLabel(mode: String) = when (mode) {
"strong" -> "Fingerprint or face" "strong" -> "Fingerprint or face"