diff --git a/.gitignore b/.gitignore index 022f90a..7f9bb45 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ target .idea *.iml /dependency-reduced-pom.xml +gen-external-apklibs diff --git a/pom.xml b/pom.xml index 9465e80..f7f85f9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.j256.ormlite ormlite-android 6.2-SNAPSHOT - jar + aar ORMLite Android https://ormlite.com/ Lightweight Object Relational Model (ORM) Android classes @@ -34,7 +34,8 @@ 4.1.1.4 - r6 + 1.0.0 + 28 3.4 1.4.200 @@ -249,6 +250,15 @@ false + + com.simpligility.maven.plugins + android-maven-plugin + + + ${android-sdk-version} + + + org.apache.maven.plugins maven-shade-plugin @@ -272,6 +282,13 @@ + + com.simpligility.maven.plugins + android-maven-plugin + 4.2.0 + true + + org.eclipse.m2e @@ -321,6 +338,13 @@ + + + google + Google Maven + https://maven.google.com/ + + @@ -335,10 +359,12 @@ true - com.google.android - support-v4 - ${android-support-version} + androidx.loader + loader + compile + 1.1.0 true + aar diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5ccc790 --- /dev/null +++ b/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/main/java/com/j256/ormlite/android/apptools/support/OrmLiteCursorLoader.java b/src/main/java/com/j256/ormlite/android/apptools/support/OrmLiteCursorLoader.java index aa6361f..f99ccdd 100644 --- a/src/main/java/com/j256/ormlite/android/apptools/support/OrmLiteCursorLoader.java +++ b/src/main/java/com/j256/ormlite/android/apptools/support/OrmLiteCursorLoader.java @@ -3,7 +3,6 @@ import static com.j256.ormlite.stmt.StatementBuilder.StatementType.SELECT; import java.sql.SQLException; - import com.j256.ormlite.android.AndroidCompiledStatement; import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.Dao.DaoObserver; @@ -12,7 +11,7 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; /** * Cursor loader supported by later Android APIs that allows asynchronous content loading.