skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Migrating to JDK 1.8

Browse Source
This commit is contained in:
Maarten Billemont
2018-05-15 17:12:42 -04:00
parent bda1ac3bd4
commit 8bdf1755b7
13 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform-android/build.gradle
View File

@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion '25.0.0'
buildToolsVersion '25.0.3'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
@@ -15,6 +15,7 @@ android {
targetSdkVersion 25
versionCode 20501
versionName '2.5.1'
jackOptions.enabled true
}
// release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle assembleRelease

1
platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java
View File

@@ -38,6 +38,7 @@ import com.google.common.primitives.UnsignedInteger;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.lyndir.lhunath.opal.system.logging.Logger;
import com.lyndir.masterpassword.model.MPConstant;
import java.text.MessageFormat;
import java.util.*;
import java.util.concurrent.Executors;