Added legacy apache library so it compiles on newer SDKs
This commit is contained in:
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id="Android_Pebble_SD" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="java-gradle" name="Java-Gradle">
|
||||
<configuration>
|
||||
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
||||
<option name="BUILDABLE" value="false" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -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'
|
||||
}
|
||||
|
||||
@@ -16,3 +16,4 @@ allprojects {
|
||||
|
||||
dependencies {
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user