nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-01 16:51:16 +00:00
Code Releases Activity

Raise targetSdk to 28 (#378)

Browse source 
Raise targetSdk to 28
This commit is contained in:
Catfriend1 2019-03-23 11:59:41 +01:00 committed by GitHub
parent 5755ed45ad
commit bde917d244
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -7,8 +7,8 @@ android:
components: components:
- tools - tools
- platform-tools - platform-tools
- build-tools-27.0.3 - build-tools-29.0.0-rc1
- android-27 - android-28
- extra-android-m2repository - extra-android-m2repository
# Install Android NDK (apparently there is no easier way to do this) # Install Android NDK (apparently there is no easier way to do this)

14
app/build.gradle
View file

@ -7,15 +7,15 @@ dependencies {
implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.google.zxing:android-integration:3.3.0' implementation 'com.google.zxing:android-integration:3.3.0'
implementation 'com.google.code.gson:gson:2.8.3' implementation 'com.google.code.gson:gson:2.8.5'
implementation 'org.mindrot:jbcrypt:0.4' implementation 'org.mindrot:jbcrypt:0.4'
// com.google.guava:guava:24.1-jre will crash on Android 5.x // com.google.guava:guava:24.1-jre will crash on Android 5.x
implementation 'com.google.guava:guava:26.0-android' implementation 'com.google.guava:guava:26.0-android'
implementation 'com.annimon:stream:1.1.9' implementation 'com.annimon:stream:1.2.1'
implementation 'com.android.volley:volley:1.1.0' implementation 'com.android.volley:volley:1.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.google.dagger:dagger:2.14.1' implementation 'com.google.dagger:dagger:2.21'
annotationProcessor "com.google.dagger:dagger-compiler:2.14.1" annotationProcessor "com.google.dagger:dagger-compiler:2.21"
androidTestImplementation 'com.android.support.test:rules:1.0.2' androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support:support-annotations:28.0.0' androidTestImplementation 'com.android.support:support-annotations:28.0.0'
} }
@ -23,7 +23,7 @@ dependencies {
android { android {
// Changes to these values need to be reflected in `.travis.yml` // Changes to these values need to be reflected in `.travis.yml`
compileSdkVersion 28 compileSdkVersion 28
buildToolsVersion '28.0.3' buildToolsVersion '29.0.0-rc1'
buildTypes.debug.applicationIdSuffix ".debug" buildTypes.debug.applicationIdSuffix ".debug"
dataBinding.enabled = true dataBinding.enabled = true
@ -36,7 +36,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.github.catfriend1.syncthingandroid" applicationId "com.github.catfriend1.syncthingandroid"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 28
versionCode 1010005 versionCode 1010005
versionName "1.1.0.5" versionName "1.1.0.5"
testApplicationId 'com.github.catfriend1.syncthingandroid.test' testApplicationId 'com.github.catfriend1.syncthingandroid.test'

2
app/src/main/AndroidManifest.xml
View file

@ -19,6 +19,8 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!-- ACCESS_FINE_LOCATION is required to get WiFi's SSID on 10 "Q" --> <!-- ACCESS_FINE_LOCATION is required to get WiFi's SSID on 10 "Q" -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<!-- FOREGROUND_SERVICE is required since Android 9 SDK 28 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:allowBackup="false" android:allowBackup="false"

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.github.triplet.gradle:play-publisher:1.2.0' classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'

3
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,5 @@ 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.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
android.enableSeparateAnnotationProcessing=true