summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2019-12-31 20:57:38 +0530
committerAditya Wasan <adityawasan55@gmail.com>2019-12-31 20:57:38 +0530
commitd5a744bd37ec8c54d719552a813a82c636e43ed3 (patch)
treef2ebab86af9f0d0db41847a446309c952412b01d
parentbfbbdecc0796fdd8e68b675e3fd8d26dd99a8d60 (diff)
Prepare for new Play Store listing (#602)
* Gradle cleanup * Update package name * Remove release APK from git This should have never been here * Move package name to dependencies.gradle * github: Setup caching for gradle * Update Play Store art * gradle: Use constraints API in place of deprecated force * Update dependencies * Raise minSdk to 23 * Target SDK 28 for now External storage handling changes are atrocious to support in this codebase so we'll be holding out as far as we can. * Revert "Opt into legacy external storage handling (#595)" Not needed on SDK 28 This reverts commit 3f249e4bffffe0ba30e7546735c7fb4576918c69. Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
-rw-r--r--.github/workflows/deploy_snapshot.yml5
-rw-r--r--.github/workflows/pull_request.yml8
-rw-r--r--app/build.gradle13
-rw-r--r--app/release/app-release.apkbin3995966 -> 0 bytes
-rw-r--r--app/src/main/AndroidManifest.xml1
-rw-r--r--app/src/main/ic_launcher-web.pngbin36235 -> 16541 bytes
-rw-r--r--build.gradle13
-rw-r--r--dependencies.gradle19
-rw-r--r--media/play_store_banner.pngbin0 -> 34278 bytes
9 files changed, 30 insertions, 29 deletions
diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 110546b1..4c5bda07 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -17,6 +17,11 @@ jobs:
env:
ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+ - uses: actions/cache@v1
+ with:
+ path: ~/.gradle/caches
+ key: gradle-${{ runner.os }}-${{ hashFiles('**/build.gradle') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/dependencies.gradle') }}
+
- name: Download gradle dependencies
run: ./gradlew dependencies
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e158846c..283699b9 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -5,8 +5,16 @@ jobs:
test-pr:
runs-on: ubuntu-latest
steps:
+
- uses: actions/checkout@master
+
+ - uses: actions/cache@v1
+ with:
+ path: ~/.gradle/caches
+ key: gradle-${{ runner.os }}-${{ hashFiles('**/build.gradle') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/dependencies.gradle') }}
+
- run: ./gradlew spotlessCheck build test lintDebug -Dpre-dex=false
+
- uses: actions/upload-artifact@master
with:
name: Debug APK
diff --git a/app/build.gradle b/app/build.gradle
index 9666a547..50a9a67d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,14 +4,9 @@
*/
plugins {
id 'kotlin-android'
- id 'kotlin-kapt'
id 'kotlin-android-extensions'
}
-repositories {
- maven { url 'https://jitpack.io' }
-}
-
final def keystorePropertiesFile = rootProject.file 'keystore.properties'
final def gitHash = { ->
@@ -37,7 +32,7 @@ android {
}
defaultConfig {
- applicationId 'com.zeapo.pwdstore'
+ applicationId versions.packageName
}
lintOptions {
@@ -88,8 +83,10 @@ dependencies {
implementation deps.androidx.constraint_layout
implementation deps.androidx.documentfile
implementation deps.androidx.preference
- implementation (deps.androidx.recycler_view) {
- force = true
+ constraints {
+ implementation(deps.androidx.recycler_view) {
+ because 'versions above 1.0.0 have an accessibility related bug that causes crashes'
+ }
}
implementation deps.androidx.material
implementation deps.third_party.commons_io
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
deleted file mode 100644
index 1b52df9a..00000000
--- a/app/release/app-release.apk
+++ /dev/null
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98b1b924..26fad727 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,6 @@
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:requestLegacyExternalStorage="true"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index f61a368b..8c5539c4 100644
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
Binary files differ
diff --git a/build.gradle b/build.gradle
index cebef7da..63adfba5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,6 @@ buildscript {
repositories {
google()
jcenter()
- mavenCentral()
- maven { url 'https://plugins.gradle.org/m2/' }
}
dependencies {
classpath deps.gradle_plugin.android
@@ -18,15 +16,7 @@ buildscript {
}
plugins {
- id "com.github.ben-manes.versions" version "0.27.0"
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- mavenCentral()
- }
+ id 'com.github.ben-manes.versions' version '0.27.0'
}
subprojects {
@@ -35,6 +25,7 @@ subprojects {
repositories {
google()
jcenter()
+ maven { url 'https://jitpack.io' }
}
pluginManager.withPlugin('kotlin-android') {
dependencies {
diff --git a/dependencies.gradle b/dependencies.gradle
index d19989c3..f356a072 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,12 +3,13 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
ext.versions = [
- minSdk: 21,
- targetSdk: 29,
- compileSdk: 29,
+ minSdk: 23,
+ targetSdk: 28,
+ compileSdk: 28,
versionCode: 10303,
versionName: '1.3.4-SNAPSHOT',
- buildTools: '29.0.2'
+ buildTools: '29.0.2',
+ packageName: 'dev.msfjarvis.aps'
]
ext.deps = [
@@ -25,12 +26,12 @@ ext.deps = [
androidx: [
annotation: 'androidx.annotation:annotation:1.1.0',
appcompat: 'androidx.appcompat:appcompat:1.2.0-alpha01',
- biometric: 'androidx.biometric:biometric:1.0.0',
+ biometric: 'androidx.biometric:biometric:1.0.1',
cardview: 'androidx.cardview:cardview:1.0.0',
- constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta3',
+ constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta4',
core_ktx: 'androidx.core:core-ktx:1.2.0-rc01',
documentfile: 'androidx.documentfile:documentfile:1.0.1',
- material: 'com.google.android.material:material:1.2.0-alpha02',
+ material: 'com.google.android.material:material:1.2.0-alpha03',
preference: 'androidx.preference:preference:1.1.0',
recycler_view: 'androidx.recyclerview:recyclerview:1.0.0'
],
@@ -40,14 +41,14 @@ ext.deps = [
commons_codec: 'commons-codec:commons-codec:1.13',
jsch: 'com.jcraft:jsch:0.1.55',
jgit: 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r',
- openpgp_ktx: 'com.github.android-password-store:openpgp-ktx:1.0.0',
+ openpgp_ktx: 'com.github.android-password-store:openpgp-ktx:1.1.0',
ssh_auth: 'org.sufficientlysecure:sshauthentication-api:1.0'
],
testing: [
junit: 'junit:junit:4.13-rc-2',
koin_test: 'org.koin:koin-test:2.0.1',
- mockito_core: 'org.mockito:mockito-core:3.2.0',
+ mockito_core: 'org.mockito:mockito-core:3.2.4',
androidx: [
runner: 'androidx.test:runner:1.3.0-alpha03',
rules: 'androidx.test:rules:1.3.0-alpha03',
diff --git a/media/play_store_banner.png b/media/play_store_banner.png
new file mode 100644
index 00000000..23bfe418
--- /dev/null
+++ b/media/play_store_banner.png
Binary files differ