From ccf858f960bf8559f82aef5a08fe505c686cc7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 5 Mar 2016 23:01:10 +0000 Subject: [PATCH 1/7] CHANGELOG: Start writing upcoming release --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ec44e8c7..5c9386b7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### Upcoming release + +* Show what repository each apk comes from + +* Better support for Android 6.0 + +* Translation updates + ### 0.99 (2016-02-29) * Add simple "Use Tor" setting From 28988b9fdd46bfe5d4b9645e4d0ca81fd556c318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 5 Mar 2016 23:15:47 +0000 Subject: [PATCH 2/7] Bump libsuperuser to the latest version --- F-Droid/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle index b94fde9b3..b81323f3e 100644 --- a/F-Droid/build.gradle +++ b/F-Droid/build.gradle @@ -16,7 +16,7 @@ dependencies { compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' compile 'com.google.zxing:core:3.2.1' - compile 'eu.chainfire:libsuperuser:1.0.0.201602011018' + compile 'eu.chainfire:libsuperuser:1.0.0.201602271131' compile 'cc.mvdan.accesspoint:library:0.1.3' compile 'info.guardianproject.netcipher:netcipher:1.2.1' compile 'commons-net:commons-net:3.4' @@ -70,7 +70,7 @@ if (!hasProperty('sourceDeps')) { 'com.android.support:support-annotations:7f21659b084da073b77b6f7fe7ab250c4f23346238d4efdbbbb937e017ae4693', 'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4', 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259', - 'eu.chainfire:libsuperuser:952c5fc82f9c31d31d2b6a7054ee267dac1685fb037a254888c73c48de661eaf', + 'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128', 'cc.mvdan.accesspoint:library:dc89a085d6bc40381078b8dd7776b12bde0dbaf8ffbcddb17ec4ebc3edecc7ba', 'commons-net:commons-net:38cf2eca826b8bcdb236fc1f2e79e0c6dd8e7e0f5c44a3b8e839a1065b2fbe2e', 'info.guardianproject.netcipher:netcipher:611ec5bde9d799fd57e1efec5c375f9f460de2cdda98918541decc9a7d02f2ad', From 25a9360a58726ce26ab2a60ffc3114a64c825cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 5 Mar 2016 23:21:15 +0000 Subject: [PATCH 3/7] Fix ScrollViewSize lint warnings --- F-Droid/res/layout-v11/install_confirm.xml | 2 +- F-Droid/res/layout/install_confirm.xml | 2 +- F-Droid/res/layout/repodetails.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/F-Droid/res/layout-v11/install_confirm.xml b/F-Droid/res/layout-v11/install_confirm.xml index 911e8d944..7676b2b75 100644 --- a/F-Droid/res/layout-v11/install_confirm.xml +++ b/F-Droid/res/layout-v11/install_confirm.xml @@ -70,7 +70,7 @@ android:background="@drawable/tab_unselected_holo" android:fillViewport="true" android:scrollbars="none"> - - Date: Sat, 5 Mar 2016 23:27:00 +0000 Subject: [PATCH 4/7] Bump targetSdkVersion to 23 compileSdkVersion in the build.gradle file was already bumped, but we forgot about this one. --- F-Droid/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml index 98aaedbd8..31b67b8c4 100644 --- a/F-Droid/AndroidManifest.xml +++ b/F-Droid/AndroidManifest.xml @@ -8,7 +8,7 @@ Date: Sat, 5 Mar 2016 23:27:18 +0000 Subject: [PATCH 5/7] Explicitly set fullBackupContent to true An F-Droid backup should contain all the app's data. --- F-Droid/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml index 31b67b8c4..6f9339aeb 100644 --- a/F-Droid/AndroidManifest.xml +++ b/F-Droid/AndroidManifest.xml @@ -62,6 +62,7 @@ android:label="@string/app_name" android:description="@string/app_description" android:allowBackup="true" + android:fullBackupContent="true" android:theme="@style/AppThemeLight" android:supportsRtl="true" > From 26d60aa9aee4e1c868f8078bb9a236bcd4158def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 5 Mar 2016 23:33:52 +0000 Subject: [PATCH 6/7] Fix gradlew references in markdown files Use gradlew consistently. Also, fix its calling after the cd. --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7c6208cf..445bf848f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ To get all the logcat messages by F-Droid, you can run: ## Building tips -* Use `gradle --daemon` if you are going to build F-Droid multiple times. +* Use gradle with `--daemon` if you are going to build F-Droid multiple times. * If you get a message like `Could not find com.android.support:support-...`, make sure that you have the latest Android support maven repository. @@ -65,7 +65,7 @@ In order to run the F-Droid test suite, you will need to have either a real devi connected via `adb`, or an emulator running. Then, execute the following from the command line: - gradle connectedCheck + ./gradlew connectedCheck Note that the CI already runs the tests on an emulator, so you don't necessarily have to do this yourself if you open a merge request as the tests diff --git a/README.md b/README.md index 5c8bb86d4..573edea2a 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ for Android. ## Building with Gradle cd F-Droid - ./gradlew assembleRelease + ../gradlew assembleRelease ## Direct download From b8ce62e3ef9f6f7822c2a58ebfce4b7f154e1237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 5 Mar 2016 23:39:30 +0000 Subject: [PATCH 7/7] README: Fix badge link The old /ci site is gone. Link to the builds page, which at least shows something related to CI. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 573edea2a..b361bf32f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # F-Droid Client -[![build status](https://gitlab.com/ci/projects/6571/status.png?ref=master)](https://gitlab.com/ci/projects/6571?ref=master) [![Translation status](https://hosted.weblate.org/widgets/f-droid/-/svg-badge.svg)](https://hosted.weblate.org/engage/f-droid/) +[![build status](https://gitlab.com/ci/projects/6571/status.png?ref=HEAD)](https://gitlab.com/fdroid/fdroidclient/builds) [![Translation status](https://hosted.weblate.org/widgets/f-droid/-/svg-badge.svg)](https://hosted.weblate.org/engage/f-droid/) Client for [F-Droid](https://f-droid.org), the Free Software repository system for Android.