nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 06:11:19 +00:00
Code Releases Activity

Bump gradle from 3.1.3 to 3.4.2 (#1381)

Browse source 
* Bump gradle from 3.1.3 to 3.4.2

Bumps gradle from 3.1.3 to 3.4.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix mistakes resulting in build errors after gradle upgrade
This commit is contained in:
Simon Frei 2019-08-15 11:48:23 +02:00 committed by GitHub
parent 3090cdd67a
commit 4414dcc8a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
View file

@ -125,7 +125,7 @@ public class SyncthingRunnable implements Runnable {
// Potential fix for #498, keep the CPU running while native binary is running // Potential fix for #498, keep the CPU running while native binary is running
PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
PowerManager.WakeLock wakeLock = useWakeLock() PowerManager.WakeLock wakeLock = useWakeLock()
? pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG) ? pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, mContext.getString(R.string.app_name) + ":" + TAG)
: null; : null;
try { try {
if (wakeLock != null) if (wakeLock != null)

1
app/src/main/res/layout/item_folder_list.xml
View file

@ -32,7 +32,6 @@
android:id="@+id/state" android:id="@+id/state"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBottom="@id/id"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:textAppearance="?textAppearanceListItemSmall" /> android:textAppearance="?textAppearanceListItemSmall" />

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.3' classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.22.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.22.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong