diff --git a/Android_Pebble_SD.iml b/Android_Pebble_SD.iml deleted file mode 100644 index 55979db..0000000 --- a/Android_Pebble_SD.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 944795a..4675763 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,9 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 24 + buildToolsVersion '24.0.1' + useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "uk.org.openseizuredetector" @@ -25,14 +26,12 @@ android { dependencies { compile files('libs/mpandroidchartlibrary-2-0-7.jar') compile 'com.getpebble:pebblekit:3.0.0@aar' - // Unit testing dependencies testCompile 'junit:junit:4.12' // Set this dependency if you want to use Mockito testCompile 'org.mockito:mockito-core:1.10.19' // Set this dependency if you want to use Hamcrest matching testCompile 'org.hamcrest:hamcrest-library:1.1' - compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:support-v4:22.2.1' } diff --git a/build.gradle b/build.gradle index e592b76..de4e69c 100644 --- a/build.gradle +++ b/build.gradle @@ -16,3 +16,4 @@ allprojects { dependencies { } + diff --git a/local.properties b/local.properties deleted file mode 100644 index 6b806ea..0000000 --- a/local.properties +++ /dev/null @@ -1,12 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Tue Jul 19 22:15:48 BST 2016 -ndk.dir=/usr/local/android-sdk-linux/ndk-bundle -sdk.dir=/usr/local/android-sdk-linux