Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androidX migrations preparations

Browse Source 
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.
This commit is contained in:
Marcus Hoffmann 2020-06-15 19:00:29 +02:00 committed by Dominik Schürmann
parent d0604cb886
commit e2a75f69ee
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/build.gradle
View File

@ -21,14 +21,15 @@ def basicApplicationId = "org.fdroid.basic"
def privilegedExtensionApplicationId = '"org.fdroid.fdroid.privileged"' def privilegedExtensionApplicationId = '"org.fdroid.fdroid.privileged"'
android { android {
compileSdkVersion 27 compileSdkVersion 28
buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
versionCode 1010000 versionCode 1010000
versionName getVersionName() versionName getVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
minSdkVersion 14
targetSdkVersion 25
/* /*
The Android Testing Support Library collects analytics to continuously improve the testing 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 experience. More specifically, it uploads a hash of the package name of the application
@ -134,17 +135,17 @@ android {
} }
dependencies { dependencies {
implementation 'com.android.support:support-v4:27.1.1' implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:gridlayout-v7:27.1.1' implementation 'com.android.support:gridlayout-v7:28.0.0'
implementation 'com.android.support:support-annotations:27.1.1' implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:design:27.1.1' implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:support-vector-drawable:27.1.1' implementation 'com.android.support:support-vector-drawable:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:palette-v7:27.1.1' implementation 'com.android.support:palette-v7:28.0.0'
implementation 'com.android.support:preference-v14:27.1.1' implementation 'com.android.support:preference-v14:28.0.0'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'com.google.zxing:core:3.3.3' implementation 'com.google.zxing:core:3.3.3'

5
app/src/main/AndroidManifest.xml
View File

@ -26,11 +26,6 @@
package="org.fdroid.fdroid" package="org.fdroid.fdroid"
android:installLocation="auto"> android:installLocation="auto">
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="25"
/>
<supports-screens <supports-screens
android:anyDensity="true" android:anyDensity="true"
android:largeScreens="true" android:largeScreens="true"

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter() // download from jCenter as last resort https://blog.autsoft.hu/a-confusing-dependency jcenter() // download from jCenter as last resort https://blog.autsoft.hu/a-confusing-dependency
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.2.0'
} }
} }
allprojects { allprojects {

5
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,7 @@
#Mon Jun 15 18:54:54 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
distributionSha256Sum=e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389 distributionSha256Sum=98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915