diff --git a/.gitignore b/.gitignore index 1fbba0fa..7f783eea 100644 --- a/.gitignore +++ b/.gitignore @@ -17,18 +17,9 @@ DerivedData/ /platform-darwin/Podfile.lock /platform-darwin/Pods/ -# Media -public/Press/Background.png -public/Press/Front-Page.png -public/Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf - # Gradle build -!/build .gradle local.properties +/gradle/builds /platform-android/.externalNativeBuild - -# Maven -target -dependency-reduced-pom.xml diff --git a/gradle/README.md b/gradle/README.md index 8fdb2a38..d2d89327 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -2,11 +2,11 @@ To build a release distribution: Desktop: - STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-desktop) gradle clean masterpassword-gui:shadowJar + STORE_PW=$(mpw masterpassword.keystore) KEY_PW_DESKTOP=$(mpw masterpassword-desktop) gradle clean masterpassword-gui:shadowJar Android: - STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle clean masterpassword-android:assembleRelease + STORE_PW=$(mpw masterpassword.keystore) KEY_PW_ANDROID=$(mpw masterpassword-android) gradle clean masterpassword-android:assembleRelease Note: diff --git a/platform-android/build.gradle b/platform-android/build.gradle index 80df5283..ed491ee3 100644 --- a/platform-android/build.gradle +++ b/platform-android/build.gradle @@ -8,8 +8,8 @@ android { applicationId 'com.lyndir.masterpassword' minSdkVersion 19 targetSdkVersion 25 - versionCode 20501 - versionName '2.5.1' + versionCode 20701 + versionName '2.7.1' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8