Skip to content

Commit 5864287

Browse files
committed
fixes for eclipse
1 parent c39cfbe commit 5864287

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ build
99

1010
okhttp
1111
okio
12+
libs

AndroidAsync/AndroidAsync-AndroidAsync.iml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@
6060
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
6161
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
6262
</content>
63-
<content url="file://$MODULE_DIR$/../compat">
64-
<sourceFolder url="file://$MODULE_DIR$/../compat" isTestSource="false" />
65-
</content>
66-
<content url="file://$MODULE_DIR$/../conscrypt">
67-
<sourceFolder url="file://$MODULE_DIR$/../conscrypt" isTestSource="false" />
68-
</content>
6963
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
7064
<orderEntry type="sourceFolder" forTests="false" />
7165
</component>

AndroidAsync/build.gradle

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,29 @@ buildscript {
99
apply plugin: 'com.android.library'
1010

1111
android {
12-
dependencies {
13-
// compile 'com.squareup.okio:okio:+'
14-
// androidTestCompile 'com.squareup.okhttp:okhttp:1.+'
15-
}
16-
1712
sourceSets {
1813
main {
1914
manifest.srcFile 'AndroidManifest.xml'
2015

21-
// jniLibs.srcDirs = ['libs/']
16+
jniLibs.srcDirs = ['libs/']
2217

2318
java.srcDirs=['src/'
24-
// , 'okhttp/'
25-
// , 'okhttp-shim/'
26-
// , '../okio/okio/src/main/java/'
27-
, '../conscrypt/'
28-
, '../compat/'
29-
// , '../okhttp/okhttp/src/main/java/'
19+
// , '../conscrypt/'
20+
// , '../compat/'
3021
]
3122
}
3223
androidTest.java.srcDirs=['test/src/']
3324
androidTest.res.srcDirs=['test/res/']
3425
androidTest.assets.srcDirs=['test/assets/']
3526
}
3627

37-
compileOptions {
38-
sourceCompatibility JavaVersion.VERSION_1_7
39-
targetCompatibility JavaVersion.VERSION_1_7
28+
lintOptions {
29+
abortOnError false
30+
}
31+
32+
defaultConfig {
33+
minSdkVersion 9
34+
targetSdkVersion 19
4035
}
4136

4237
compileSdkVersion 19

AndroidAsync/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-L
14+
target=android-19
1515
android.library=true
1616

1717

0 commit comments

Comments
 (0)