skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Gradle update.

Browse Source
This commit is contained in:
Maarten Billemont
2019-09-23 14:13:03 -04:00
parent d0cf57105a
commit d0dc393d70
26 changed files with 111 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform-independent/java/algorithm/build.gradle
View File

@@ -1,5 +1,6 @@
plugins {
id 'java-library'
id 'com.github.spotbugs' version '2.0.0'
}
description = 'Master Password Algorithm Implementation'
@@ -16,10 +17,8 @@ configurations {
dependencies {
implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.5'
api group: 'org.jetbrains', name: 'annotations', version: '13.0'
api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
api group: 'com.google.code.findbugs', name: 'findbugs-annotations', version: '3.0.1'
api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.8'
api group: 'org.jetbrains', name: 'annotations', version: '16.0.2'
lib project( path: ':masterpassword-core', configuration: 'default' )
}

6
platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
View File

@@ -199,5 +199,11 @@ public final class Native {
return x86;
}
@Override
public String toString() {
return name().replace('_', '-' );
}
}
}

5
platform-independent/java/gui/build.gradle
View File

@@ -1,7 +1,8 @@
plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '2.0.4'
id 'com.github.spotbugs' version '2.0.0'
id 'com.github.johnrengelman.shadow' version '5.1.0'
}
description = 'Master Password GUI'
@@ -31,7 +32,7 @@ shadowJar {
storepass: System.getenv( 'STORE_PW' ),
keypass: System.getenv( 'KEY_PW_DESKTOP' ),
preservelastmodified: 'true',
signedJar: "${rootDir}/../public/site/${project.name}-${project.version}.jar" )
signedJar: "${rootDir}/public/site/${project.name}-${project.version}.jar" )
}
}

15
platform-independent/java/model/build.gradle
View File

@@ -1,22 +1,19 @@
plugins {
id 'java-library'
id 'net.ltgt.apt' version '0.9'
id 'com.github.spotbugs' version '2.0.0'
}
description = 'Master Password Site Model'
dependencies {
implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.5'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8'
implementation 'com.github.spotbugs:spotbugs-annotations:4.0.0-beta4'
api project( ':masterpassword-algorithm' )
api group: 'joda-time', name: 'joda-time', version: '2.4'
api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.5'
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.5'
api group: 'com.google.code.findbugs', name: 'findbugs-annotations', version: '3.0.1'
compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
apt group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
api group: 'joda-time', name: 'joda-time', version: '2.10'
api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.8'
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
testImplementation group: 'org.testng', name: 'testng', version: '6.8.5'
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'

2
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/Changeable.java
View File

@@ -29,7 +29,7 @@ public abstract class Changeable {
}
changeExecutor.submit( () -> {
synchronized (changeExecutor) {
synchronized (mutex) {
if (grouping != Grouping.APPLY)
return;
changed = false;

4
platform-independent/java/tests/build.gradle
View File

@@ -1,17 +1,21 @@
plugins {
id 'java'
id 'com.github.spotbugs' version '2.0.0'
}
description = 'Master Password Test Suite'
dependencies {
implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
implementation project( ':masterpassword-algorithm' )
implementation project( ':masterpassword-model' )
testImplementation group: 'org.testng', name: 'testng', version: '6.8.5'
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
runtime group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.1'
}
test.useTestNG()