From 53a27d9c13fc0ff3d003e5e1eaa4c5c72b965c1c Mon Sep 17 00:00:00 2001 From: asdoi Date: Thu, 11 Jun 2020 17:35:07 +0200 Subject: [PATCH 1/4] updated dependencies --- app/build.gradle | 29 +++++++----------------- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- local.properties | 8 +++---- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 95ad8f0..24dc09a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,7 @@ apply plugin: 'com.android.application' repositories { - maven { url "http://www.atilika.org/nexus/content/repositories/atilika" } - maven { url "https://maven.google.com" } + google() maven { url 'https://jitpack.io' } } @@ -14,7 +13,7 @@ android { } compileSdkVersion 26 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.3" defaultConfig { applicationId "com.quicklyric.romanizer" minSdkVersion 15 @@ -23,22 +22,11 @@ android { versionName "1.0.3" } - signingConfigs { - - release { - storeFile file('../../release.keystore') - storePassword RELEASE_STORE_PASSWORD - keyAlias RELEASE_KEY_ALIAS - keyPassword RELEASE_KEY_PASSWORD - } - } - buildTypes { release { buildConfigField "Boolean", "REPORT_CRASH", 'true' useProguard true minifyEnabled true - signingConfig signingConfigs.release proguardFiles 'proguard-rules.pro', getDefaultProguardFile('proguard-android-optimize.txt') } @@ -64,11 +52,10 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:26.+' - compile 'me.xuender:unidecode:0.0.7' - compile 'com.github.geecko86:kuromoji:fix_issue_96-SNAPSHOT' - testCompile 'junit:junit:4.12' - compile 'com.cybozu.labs:langdetect:+' - compile 'ch.acra:acra:4.9.2' + implementation 'com.android.support:appcompat-v7:26.+' + implementation 'me.xuender:unidecode:0.0.7' + implementation 'com.github.geecko86:kuromoji:fix_issue_96-SNAPSHOT' + testImplementation 'junit:junit:4.13' + implementation 'com.cybozu.labs:langdetect:+' + implementation 'ch.acra:acra:4.9.2' } diff --git a/build.gradle b/build.gradle index d0aa704..4686e70 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e3e6b2e..008c29d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jul 01 02:39:55 CEST 2017 +#Thu Jun 11 17:28:23 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/local.properties b/local.properties index 350511d..0045f68 100644 --- a/local.properties +++ b/local.properties @@ -1,10 +1,8 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file should *NOT* be checked into Version Control Systems, +## This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -sdk.dir=/opt/android-sdk \ No newline at end of file +#Thu Jun 11 17:27:23 CEST 2020 +sdk.dir=/home/fh/Android/Sdk From 1a5fdb8383efccc7ccb6a48f2577233b25942500 Mon Sep 17 00:00:00 2001 From: asdoi Date: Thu, 11 Jun 2020 17:37:21 +0200 Subject: [PATCH 2/4] migrate to androidx and enable instant app support --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 9 +++++++-- build.gradle | 1 + gradle.properties | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 24dc09a..59cea96 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,12 +12,12 @@ android { } } - compileSdkVersion 26 + compileSdkVersion 29 buildToolsVersion "26.0.3" defaultConfig { applicationId "com.quicklyric.romanizer" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 29 versionCode 8 versionName "1.0.3" } @@ -52,7 +52,7 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:26.+' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'me.xuender:unidecode:0.0.7' implementation 'com.github.geecko86:kuromoji:fix_issue_96-SNAPSHOT' testImplementation 'junit:junit:4.13' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a64c221..f59f3b4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,9 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:dist="http://schemas.android.com/apk/distribution"> + + tools:ignore="GoogleAppIndexingWarning" + android:supportsRtl="true"> Date: Thu, 11 Jun 2020 17:48:42 +0200 Subject: [PATCH 3/4] updated proguard --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 59cea96..5687d8c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,8 @@ android { buildTypes { release { buildConfigField "Boolean", "REPORT_CRASH", 'true' - useProguard true minifyEnabled true + shrinkResources true proguardFiles 'proguard-rules.pro', getDefaultProguardFile('proguard-android-optimize.txt') } From 499140eed816496230b6c69fbd0d9ea7365e8943 Mon Sep 17 00:00:00 2001 From: asdoi <36813904+asdoi@users.noreply.github.com> Date: Mon, 20 Jul 2020 10:04:03 +0000 Subject: [PATCH 4/4] revert local.properties --- local.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/local.properties b/local.properties index 0045f68..1649c52 100644 --- a/local.properties +++ b/local.properties @@ -1,8 +1,10 @@ -## This file must *NOT* be checked into Version Control Systems, +## This file is automatically generated by Android Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file should *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Thu Jun 11 17:27:23 CEST 2020 -sdk.dir=/home/fh/Android/Sdk +sdk.dir=/opt/android-sdk