diff options
| author | Koushik Dutta <koushd@gmail.com> | 2014-07-18 13:31:25 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2014-07-18 13:31:25 -0700 |
| commit | 5864287147d01d51bf7948fb05f60bc3ad275775 (patch) | |
| tree | cf44eceb66d3a73b9e15728a749261d58198d985 /AndroidAsync | |
| parent | c39cfbe0789d91ccc20fede0f1b31dd87bf58ba2 (diff) | |
| download | AndroidAsync-5864287147d01d51bf7948fb05f60bc3ad275775.tar.gz AndroidAsync-5864287147d01d51bf7948fb05f60bc3ad275775.tar.bz2 AndroidAsync-5864287147d01d51bf7948fb05f60bc3ad275775.zip | |
fixes for eclipse
Diffstat (limited to 'AndroidAsync')
| -rw-r--r-- | AndroidAsync/AndroidAsync-AndroidAsync.iml | 6 | ||||
| -rw-r--r-- | AndroidAsync/build.gradle | 25 | ||||
| -rw-r--r-- | AndroidAsync/project.properties | 2 |
3 files changed, 11 insertions, 22 deletions
diff --git a/AndroidAsync/AndroidAsync-AndroidAsync.iml b/AndroidAsync/AndroidAsync-AndroidAsync.iml index f88736b..1cdbd09 100644 --- a/AndroidAsync/AndroidAsync-AndroidAsync.iml +++ b/AndroidAsync/AndroidAsync-AndroidAsync.iml @@ -60,12 +60,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> - <content url="file://$MODULE_DIR$/../compat"> - <sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$/../conscrypt"> - <sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" /> - </content> <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle index 81b428f..0a1985d 100644 --- a/AndroidAsync/build.gradle +++ b/AndroidAsync/build.gradle @@ -9,24 +9,15 @@ buildscript { apply plugin: 'com.android.library' android { - dependencies { -// compile 'com.squareup.okio:okio:+' -// androidTestCompile 'com.squareup.okhttp:okhttp:1.+' - } - sourceSets { main { manifest.srcFile 'AndroidManifest.xml' -// jniLibs.srcDirs = ['libs/'] + jniLibs.srcDirs = ['libs/'] java.srcDirs=['src/' -// , 'okhttp/' -// , 'okhttp-shim/' -// , '../okio/okio/src/main/java/' - , '../conscrypt/' - , '../compat/' -// , '../okhttp/okhttp/src/main/java/' +// , '../conscrypt/' +// , '../compat/' ] } androidTest.java.srcDirs=['test/src/'] @@ -34,9 +25,13 @@ android { androidTest.assets.srcDirs=['test/assets/'] } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + lintOptions { + abortOnError false + } + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 19 } compileSdkVersion 19 diff --git a/AndroidAsync/project.properties b/AndroidAsync/project.properties index fe357b1..edc832b 100644 --- a/AndroidAsync/project.properties +++ b/AndroidAsync/project.properties @@ -11,7 +11,7 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-L +target=android-19 android.library=true |