From d5fd9c615ce0d86f58f901f40e977105335c6684 Mon Sep 17 00:00:00 2001
From: Leandro <leruiz@dc.uba.ar>
Date: Thu, 7 Oct 2021 12:55:42 -0300
Subject: [PATCH 1/2] Replaced deprecated Android support-v4 library for
 AndroidX loader library - Now builds .aar - Added .aar plugins for maven -
 Needs Android SDK (just set $ANDROID_HOME environment variable)

---
 .gitignore                                    |  1 +
 pom.xml                                       | 36 ++++++++++++++++---
 src/main/AndroidManifest.xml                  |  3 ++
 .../apptools/support/OrmLiteCursorLoader.java |  3 +-
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 src/main/AndroidManifest.xml

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..e004ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -321,6 +338,13 @@
 			</extension>
 		</extensions>
 	</build>
+	<repositories>
+		<repository>
+			<id>google</id>
+			<name>Google Maven</name>
+			<url>http://maven.google.com/</url>
+		</repository>
+	</repositories>
 	<dependencies>
 		<!-- main dependencies -->
 		<dependency>
@@ -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 -->
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 @@
+<manifest package="com.j256.ormlite">
+
+</manifest>
\ 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.

From 87c31c71a1813500dc02af55cd335091db3753cf Mon Sep 17 00:00:00 2001
From: Jorge Nogueiras <jorge.nogueiras@etermax.com>
Date: Fri, 11 Feb 2022 17:41:18 -0300
Subject: [PATCH 2/2] Changed to https the google maven repository

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e004ce6..f7f85f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,7 +342,7 @@
 		<repository>
 			<id>google</id>
 			<name>Google Maven</name>
-			<url>http://maven.google.com/</url>
+			<url>https://maven.google.com/</url>
 		</repository>
 	</repositories>
 	<dependencies>