mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 23:55:08 +00:00
Code Issues Releases Wiki Activity

Merge branch '1.x' of git.kde.org:kdeconnect-android into 1.x

Browse Source
This commit is contained in:
Albert Vaca
2017-07-14 01:38:45 +02:00
parent a8842b189c 7ffd7c2682
commit 5bef181c8f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -3,14 +3,14 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.android.tools.build:gradle:2.3.3'
} }
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
buildToolsVersion '25.0.2' buildToolsVersion '25.0.3'
compileSdkVersion 25 compileSdkVersion 25
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
@@ -71,9 +71,9 @@ dependencies {
mavenCentral() mavenCentral()
} }
compile 'com.android.support:support-v4:25.1.1' compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.1.1' compile 'com.android.support:design:25.3.1'
compile 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android compile 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android

2
src/org/kde/kdeconnect/Plugins/PluginFactory.java
View File

@@ -146,7 +146,7 @@ public class PluginFactory {
} catch(Exception e) { } catch(Exception e) {
Log.e("PluginFactory","getPluginInfo exception"); Log.e("PluginFactory","getPluginInfo exception");
e.printStackTrace(); e.printStackTrace();
return null; throw new RuntimeException(e);
} }
} }