diff --git a/build.gradle b/build.gradle index d42b7f9..7ad0cd6 100644 --- a/build.gradle +++ b/build.gradle @@ -41,8 +41,8 @@ allprojects { ext { snapshot = !project.hasProperty('release') - minSdkVersion = 14 - targetSdkVersion = 19 + minSdkVersion = 10 + targetSdkVersion = 20 versionCode = 1 } diff --git a/shillelagh-processor/src/main/java/shillelagh/internal/TableObject.java b/shillelagh-processor/src/main/java/shillelagh/internal/TableObject.java index d970d47..c5b93f3 100644 --- a/shillelagh-processor/src/main/java/shillelagh/internal/TableObject.java +++ b/shillelagh-processor/src/main/java/shillelagh/internal/TableObject.java @@ -33,8 +33,6 @@ import javax.lang.model.element.Element; -import shillelagh.Shillelagh; - import static javax.lang.model.element.Modifier.FINAL; import static javax.lang.model.element.Modifier.PUBLIC; import static javax.lang.model.element.Modifier.STATIC; diff --git a/shillelagh/build.gradle b/shillelagh/build.gradle index 43258ac..b847651 100644 --- a/shillelagh/build.gradle +++ b/shillelagh/build.gradle @@ -25,8 +25,13 @@ apply from: '../gradle/artifactory.gradle' targetCompatibility = JavaVersion.VERSION_1_6 sourceCompatibility = JavaVersion.VERSION_1_6 +def Properties props = new Properties() +props.load(new FileInputStream(file('../local.properties'))) +def sdkDir = props["sdk.dir"] +def androidTarget = 20 + dependencies { - provided 'com.google.android:android:4.1.1.4' + compile files("${sdkDir}/platforms/android-${androidTarget}/android.jar") optional 'com.netflix.rxjava:rxjava-core:0.20.4' } diff --git a/shillelagh/src/main/java/shillelagh/QueryBuilder.java b/shillelagh/src/main/java/shillelagh/QueryBuilder.java index 1d6e101..1f57a11 100644 --- a/shillelagh/src/main/java/shillelagh/QueryBuilder.java +++ b/shillelagh/src/main/java/shillelagh/QueryBuilder.java @@ -20,7 +20,6 @@ import java.util.List; -import java.util.Objects; import rx.Observable; import static shillelagh.QueryBuilder.Operator.AND; diff --git a/shillelagh/src/main/java/shillelagh/Shillelagh.java b/shillelagh/src/main/java/shillelagh/Shillelagh.java index ce13e3f..08bcd91 100644 --- a/shillelagh/src/main/java/shillelagh/Shillelagh.java +++ b/shillelagh/src/main/java/shillelagh/Shillelagh.java @@ -191,7 +191,7 @@ public , M> T map(Class tableClass, Cursor cursor final Class shillelagh = findShillelaghForClass(tableClass); final Method mapMethod = findMethodForClass(shillelagh, $$MAP_OBJECT_FUNCTION, /* cursor is interface so can't resolve automatically */ - new Class[] { Cursor.class, SQLiteDatabase.class }); + new Class[] {Cursor.class, SQLiteDatabase.class}); final T results = (T) mapMethod.invoke(null, cursor, getReadableDatabase()); cursor.close(); return results; @@ -216,7 +216,7 @@ public T singleMap(Class tableClass, Cursor cursor) { final Class shillelagh = findShillelaghForClass(tableClass); final Method mapMethod = findMethodForClass(shillelagh, $$MAP_SINGLE_FUNCTION, /* cursor is interface so can't resolve automatically */ - new Class[] { Cursor.class, SQLiteDatabase.class }); + new Class[] {Cursor.class, SQLiteDatabase.class}); return (T) mapMethod.invoke(null, cursor, getReadableDatabase()); } catch (RuntimeException e) { throw e;