2
0

Fix gradle build with missing local.properties.

This commit is contained in:
Maarten Billemont 2017-09-21 10:32:38 -04:00
parent 05a9ba46d0
commit 6e2289994c
5 changed files with 8 additions and 9 deletions

View File

@ -6,6 +6,6 @@ git:
script: script:
- "( brew install libsodium json-c )" - "( brew install libsodium json-c )"
- "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )" - "( 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 iOS' -sdk iphonesimulator )"
- "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )"

View File

@ -23,9 +23,7 @@ import javax.annotation.Nullable;
/** /**
* bugs: * @see MasterKey.Version#V1
* - V2: miscounted the byte-length for multi-byte full names.
* - V1: miscounted the byte-length for multi-byte site names.
* *
* @author lhunath, 2014-08-30 * @author lhunath, 2014-08-30
*/ */

View File

@ -28,8 +28,7 @@ import javax.annotation.Nullable;
/** /**
* bugs: * @see MasterKey.Version#V2
* - V2: miscounted the byte-length for multi-byte full names.
* *
* @author lhunath, 2014-08-30 * @author lhunath, 2014-08-30
*/ */

View File

@ -29,8 +29,7 @@ import java.util.Arrays;
/** /**
* bugs: * @see MasterKey.Version#V3
* - no known issues.
* *
* @author lhunath, 2014-08-30 * @author lhunath, 2014-08-30
*/ */

View File

@ -1,7 +1,10 @@
rootProject.name = 'masterpassword' rootProject.name = 'masterpassword'
def local = new Properties(); def local = new Properties();
local.load(file('local.properties').newDataInputStream()) try {
local.load(file('local.properties').newDataInputStream())
} catch (FileNotFoundException ignored) {
}
include 'masterpassword-algorithm' include 'masterpassword-algorithm'
project(':masterpassword-algorithm').projectDir = new File( '../core/java/algorithm' ) project(':masterpassword-algorithm').projectDir = new File( '../core/java/algorithm' )