From e2a75f69ee0f4d2bfe4244ba7be58b16c57d2310 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Mon, 15 Jun 2020 19:00:29 +0200
Subject: [PATCH] androidX migrations preparations
We need compileSdk 28 and the required AGP and gradle versions, as well
as updating to compatible support library revisions.
minSdk and targetSdk needs to move to build.gradle from manifest.
buildToolsVersion isn't used anymore.
---
app/build.gradle | 25 ++++++++++++------------
app/src/main/AndroidManifest.xml | 5 -----
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 5 +++--
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 10b65bb8e..dafde2cf6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,14 +21,15 @@ def basicApplicationId = "org.fdroid.basic"
def privilegedExtensionApplicationId = '"org.fdroid.fdroid.privileged"'
android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
defaultConfig {
versionCode 1010000
versionName getVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ minSdkVersion 14
+ targetSdkVersion 25
/*
The Android Testing Support Library collects analytics to continuously improve the testing
experience. More specifically, it uploads a hash of the package name of the application
@@ -134,17 +135,17 @@ android {
}
dependencies {
- implementation 'com.android.support:support-v4:27.1.1'
- implementation 'com.android.support:appcompat-v7:27.1.1'
- implementation 'com.android.support:gridlayout-v7:27.1.1'
- implementation 'com.android.support:support-annotations:27.1.1'
- implementation 'com.android.support:recyclerview-v7:27.1.1'
- implementation 'com.android.support:cardview-v7:27.1.1'
- implementation 'com.android.support:design:27.1.1'
- implementation 'com.android.support:support-vector-drawable:27.1.1'
+ implementation 'com.android.support:support-v4:28.0.0'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'com.android.support:gridlayout-v7:28.0.0'
+ implementation 'com.android.support:support-annotations:28.0.0'
+ implementation 'com.android.support:recyclerview-v7:28.0.0'
+ implementation 'com.android.support:cardview-v7:28.0.0'
+ implementation 'com.android.support:design:28.0.0'
+ implementation 'com.android.support:support-vector-drawable:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'com.android.support:palette-v7:27.1.1'
- implementation 'com.android.support:preference-v14:27.1.1'
+ implementation 'com.android.support:palette-v7:28.0.0'
+ implementation 'com.android.support:preference-v14:28.0.0'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'com.google.zxing:core:3.3.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 68c59b44f..653d777c5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,11 +26,6 @@
package="org.fdroid.fdroid"
android:installLocation="auto">
- <uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="25"
- />
-
<supports-screens
android:anyDensity="true"
android:largeScreens="true"
diff --git a/build.gradle b/build.gradle
index 1207b89b5..9a8c60953 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter() // download from jCenter as last resort https://blog.autsoft.hu/a-confusing-dependency
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.android.tools.build:gradle:3.2.0'
}
}
allprojects {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 077945983..085eb820a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Mon Jun 15 18:54:54 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
-distributionSha256Sum=e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionSha256Sum=98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915
\ No newline at end of file