skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fixes #138- delays identicon update to avoid leaking interactive keyboard input.

Browse Source
This commit is contained in:
Maarten Billemont
2017-03-10 11:31:22 -05:00
parent c3f4d148a4
commit 77bee803b8
24 changed files with 188 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
platform-android/build.gradle
View File

@@ -2,44 +2,45 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.0"
buildToolsVersion '25.0.0'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
defaultConfig {
applicationId "com.lyndir.masterpassword"
applicationId 'com.lyndir.masterpassword'
minSdkVersion 19
targetSdkVersion 25
versionCode 20401
versionName "2.4.1"
versionName '2.4.1'
}
// release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle assembleRelease
signingConfigs {
release {
storeFile file('masterpassword.keystore')
storePassword System.getenv('STORE_PW')
storeFile file( 'masterpassword.keystore' )
storePassword System.getenv( 'STORE_PW' )
keyAlias 'masterpassword-android'
keyPassword System.getenv('KEY_PW')
keyPassword System.getenv( 'KEY_PW' )
}
}
buildTypes {
release {
if (System.getenv('STORE_PW') != null)
if (System.getenv( 'STORE_PW' ) != null)
signingConfig signingConfigs.release
}
}
}
dependencies {
compile project( ':masterpassword:algorithm' )
compile project( ':masterpassword:tests' )
compile project( ':masterpassword:algorithm' )
compile project( ':masterpassword:tests' )
// Android dependencies
compile 'org.slf4j:slf4j-android:1.7.13-underscore'
compile 'com.jakewharton:butterknife:8.5.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
compile files('libs/scrypt-1.4.0-native.jar')
compile group: 'org.slf4j', name: 'slf4j-android', version:'1.7.13-underscore'
compile group: 'com.jakewharton', name: 'butterknife', version:'8.5.1'
annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version:'8.5.1'
compile files( 'libs/scrypt-1.4.0-native.jar' )
}