Skip to content

Replaced Android support-v4 library with AndroidX loader library #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Replaced Android support-v4 library with AndroidX loader library #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5fd9c6
Replaced deprecated Android support-v4 library for AndroidX loader li…
leandroruiz96 Oct 7, 2021
87c31c7
Changed to https the google maven repository
Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ target
.idea
*.iml
/dependency-reduced-pom.xml
gen-external-apklibs
36 changes: 31 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.j256.ormlite</groupId>
<artifactId>ormlite-android</artifactId>
<version>6.2-SNAPSHOT</version>
<packaging>jar</packaging>
<packaging>aar</packaging>
<name>ORMLite Android</name>
<url>https://ormlite.com/</url>
<description>Lightweight Object Relational Model (ORM) Android classes</description>
Expand Down Expand Up @@ -34,7 +34,8 @@

<!-- <android-version>2.3.3</android-version> -->
<android-version>4.1.1.4</android-version>
<android-support-version>r6</android-support-version>
<android-support-version>1.0.0</android-support-version>
<android-sdk-version>28</android-sdk-version>
<!-- external test package versions -->
<easymock-version>3.4</easymock-version>
<h2-version>1.4.200</h2-version>
Expand Down Expand Up @@ -249,6 +250,15 @@
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
<configuration>
<sdk>
<platform>${android-sdk-version}</platform>
</sdk>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -272,6 +282,13 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>4.2.0</version>
<extensions>true</extensions>
</plugin>

<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Expand Down Expand Up @@ -321,6 +338,13 @@
</extension>
</extensions>
</build>
<repositories>
<repository>
<id>google</id>
<name>Google Maven</name>
<url>https://maven.google.com/</url>
</repository>
</repositories>
<dependencies>
<!-- main dependencies -->
<dependency>
Expand All @@ -335,10 +359,12 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
<version>${android-support-version}</version>
<groupId>androidx.loader</groupId>
<artifactId>loader</artifactId>
<scope>compile</scope>
<version>1.1.0</version>
<optional>true</optional>
<type>aar</type>
</dependency>

<!-- test dependencies -->
Expand Down
3 changes: 3 additions & 0 deletions src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<manifest package="com.j256.ormlite">

</manifest>
3 changes: 1 addition & 2 deletions src/main/java/com/j256/ormlite/android/apptools/support/OrmLiteCursorLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down