diff --git a/.travis.yml b/.travis.yml index 9df2d0e4..99d1b1c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,6 @@ git: script: - "( brew install libsodium json-c )" - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )" - - "( cd ./gradle && ./gradlew test )" + - "( cd ./gradle && ./gradlew --stacktrace test )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )" diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV1.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV1.java index 94c29963..57b2d508 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV1.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV1.java @@ -23,9 +23,7 @@ import javax.annotation.Nullable; /** - * bugs: - * - V2: miscounted the byte-length for multi-byte full names. - * - V1: miscounted the byte-length for multi-byte site names. + * @see MasterKey.Version#V1 * * @author lhunath, 2014-08-30 */ diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV2.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV2.java index 08989fa0..34df547d 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV2.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV2.java @@ -28,8 +28,7 @@ import javax.annotation.Nullable; /** - * bugs: - * - V2: miscounted the byte-length for multi-byte full names. + * @see MasterKey.Version#V2 * * @author lhunath, 2014-08-30 */ diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV3.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV3.java index e4362d25..fff39699 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV3.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV3.java @@ -29,8 +29,7 @@ import java.util.Arrays; /** - * bugs: - * - no known issues. + * @see MasterKey.Version#V3 * * @author lhunath, 2014-08-30 */ diff --git a/gradle/settings.gradle b/gradle/settings.gradle index 70853cbd..669df3c9 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -1,7 +1,10 @@ rootProject.name = 'masterpassword' def local = new Properties(); -local.load(file('local.properties').newDataInputStream()) +try { + local.load(file('local.properties').newDataInputStream()) +} catch (FileNotFoundException ignored) { +} include 'masterpassword-algorithm' project(':masterpassword-algorithm').projectDir = new File( '../core/java/algorithm' )