Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile with Android 11 "R" - MANAGE_EXTERNAL_STORAGE #618

Open
wants to merge 26 commits into
base: master
from
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3b3d51b
Update build.gradle
Catfriend1 Mar 15, 2020
f083af9
Update build.gradle
Catfriend1 Mar 15, 2020
3459998
Update gradle-wrapper.properties
Catfriend1 Mar 15, 2020
048e0d0
to-revert: Remove play publisher
Catfriend1 Mar 15, 2020
9c326d9
Update build.gradle
Catfriend1 Mar 15, 2020
32eebb7
Update build.gradle
Catfriend1 Mar 15, 2020
9b0a26d
Update build.gradle
Catfriend1 Mar 15, 2020
0d6d21c
Revert "to-revert: Remove play publisher"
Catfriend1 Mar 15, 2020
3220e40
Update build.gradle
Catfriend1 Mar 15, 2020
6686ec5
Revert "Update build.gradle"
Catfriend1 Mar 15, 2020
a4b9ba7
ToDo: work around missing GetVolumePath getPath on Android R
Catfriend1 Mar 15, 2020
343d2d4
Add android.permission.MANAGE_EXTERNAL_STORAGE
Catfriend1 Mar 15, 2020
e5ae349
Fix RtlCompat lint
Catfriend1 Mar 15, 2020
4e7f620
Merge branch 'master' into 20200315-android11
Catfriend1 Mar 15, 2020
67399f2
Merge branch 'master' into 20200315-android11
Catfriend1 Mar 16, 2020
ebe0f06
Update to NDK r21
Catfriend1 Mar 22, 2020
4e6e529
build-syncthing.py: Store prereq with version in filename
Catfriend1 Mar 22, 2020
d9d1256
Update SyncthingNative to v1.4.1-rc.3
Catfriend1 Mar 22, 2020
c373b90
build-syncthing.py: Store prereq with version in filename (2)
Catfriend1 Mar 22, 2020
963e976
build-syncthing: Update to Go 1.13.9
Catfriend1 Mar 22, 2020
4622dac
build.gradle: Update com.android.tools.build:gradle to 4.0.0-beta03
Catfriend1 Mar 22, 2020
7cfa4f7
build.gradle: Update buildToolsVersion to 30.0.0-rc2
Catfriend1 Mar 22, 2020
ef450d6
AndroidManifest.xml: requestLegacyExternalStorage="false" - turn scop…
Catfriend1 Mar 22, 2020
4c82de6
Merge branch 'master' into 20200315-android11
Catfriend1 Mar 22, 2020
c68abad
FileUtils: Treat volumeId "primary" as "/storage/emulated/0"
Catfriend1 Mar 22, 2020
2a3d401
Merge branch 'master' into 20200315-android11
Catfriend1 Mar 22, 2020
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -30,11 +30,11 @@ def ourVersionName = "${versionMajor}.${versionMinor}.${versionPatch}.${versionW

android {
// Changes to these values need to be reflected in `.travis.yml`
compileSdkVersion 29
buildToolsVersion '29.0.2'
compileSdkVersion 'android-R'
buildToolsVersion '30.0.0-rc2'

buildTypes.debug.applicationIdSuffix ".debug"
dataBinding.enabled = true
buildFeatures.dataBinding = true

playConfigs {
defaultAccountConfig {
@@ -44,7 +44,7 @@ android {
defaultConfig {
applicationId "com.github.catfriend1.syncthingandroid"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 'R'
versionCode ourVersionCode
versionName ourVersionName
testApplicationId 'com.github.catfriend1.syncthingandroid.test'
@@ -29,6 +29,8 @@
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<!-- CAMERA is required for the "Syncthing Camera" feature -->
<uses-permission android:name="android.permission.CAMERA" />
<!-- MANAGE_EXTERNAL_STORAGE is required on Android 11 "R" -->
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />

<application
android:allowBackup="false"
@@ -41,7 +43,7 @@
android:supportsRtl="true"
android:installLocation="internalOnly"
android:name=".SyncthingApp"
android:requestLegacyExternalStorage="true"
android:requestLegacyExternalStorage="false"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".activities.FirstStartActivity"
@@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:4.0.0-beta03'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.26.0'

// NOTE: Do not place your application dependencies here; they belong
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.