Migrate to Android X

LeonardoCardoso · Nov 3, 2019 · a9a6f19 · a9a6f19
1 parent c71dfe5
commit a9a6f19
Show file tree

Hide file tree

Showing 31 changed files with 52 additions and 120 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ to your ProGuard rules file.
 ## Usage
 #### Instantiating 
 ```java
-import com.leocardz.link.preview.library.TextCrawler;
+import com.leocardz.linkpreview.sample.library.TextCrawler;
 // ...
 // Create an instance of the TextCrawler to parse your url into a preview.
 TextCrawler textCrawler = new TextCrawler();

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 29
 
     dexOptions {
         jumboMode = true
     }
 
     defaultConfig {
         applicationId "com.leocardz.link.preview"
-        minSdkVersion 11
-        targetSdkVersion 23
+        minSdkVersion 14
+        targetSdkVersion 29
         versionCode 1
         versionName "1.1"
     }
@@ -23,8 +23,8 @@ android {
 }
 
 dependencies {
-    implementation project(":library")
-    implementation 'com.android.support:appcompat-v7:23.1.1'
+    implementation project(':linkpreview')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 
     implementation 'com.koushikdutta.urlimageviewhelper:urlimageviewhelper:1.0.4'
     implementation 'org.jsoup:jsoup:1.11.3'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.leocardz.link.preview"
+    package="com.leocardz.linkpreview.sample"
     android:installLocation="preferExternal">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,7 +12,7 @@
         android:screenOrientation="portrait"
         android:theme="@style/App.Theme">
         <activity
-            android:name=".Main"
+            android:name="com.leocardz.linkpreview.sample.Main"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/App.Theme">

diff --git a/.../java/com/leocardz/link/preview/Main.java → ...com/leocardz/linkpreview/sample/Main.java b/.../java/com/leocardz/link/preview/Main.java → ...com/leocardz/linkpreview/sample/Main.java
@@ -1,12 +1,11 @@
-package com.leocardz.link.preview;
+package com.leocardz.linkpreview.sample;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -26,9 +25,9 @@
 
 import com.koushikdutta.urlimageviewhelper.UrlImageViewCallback;
 import com.koushikdutta.urlimageviewhelper.UrlImageViewHelper;
-import com.leocardz.link.preview.library.LinkPreviewCallback;
-import com.leocardz.link.preview.library.SourceContent;
-import com.leocardz.link.preview.library.TextCrawler;
+import com.leocardz.linkpreview.sample.library.LinkPreviewCallback;
+import com.leocardz.linkpreview.sample.library.SourceContent;
+import com.leocardz.linkpreview.sample.library.TextCrawler;
 
 import java.util.List;
 import java.util.Random;
@@ -40,7 +39,7 @@
 
 
 @SuppressWarnings("unused")
-public class Main extends ActionBarActivity {
+public class Main extends Activity {
 
     private EditText editText, editTextTitlePost, editTextDescriptionPost;
     private Button submitButton, postButton, randomButton;

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/library/LinkPreview.iml b/library/LinkPreview.iml
diff --git a/library/.gitignore → linkpreview/.gitignore b/library/.gitignore → linkpreview/.gitignore
diff --git a/library/build.gradle → linkpreview/build.gradle b/library/build.gradle → linkpreview/build.gradle
@@ -6,12 +6,12 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 29
         versionCode 1
         versionName "1.3.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -29,7 +29,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
 
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'org.mockito:mockito-android:2.22.0'
 }
 

diff --git a/library/proguard-rules.pro → linkpreview/proguard-rules.pro b/library/proguard-rules.pro → linkpreview/proguard-rules.pro
diff --git a/.../library/ProvidedDocumentTextCrawler.java → .../library/ProvidedDocumentTextCrawler.java b/.../library/ProvidedDocumentTextCrawler.java → .../library/ProvidedDocumentTextCrawler.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

diff --git a/...view/library/TestLinkPreviewCallback.java → ...mple/library/TestLinkPreviewCallback.java b/...view/library/TestLinkPreviewCallback.java → ...mple/library/TestLinkPreviewCallback.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import java.util.concurrent.CountDownLatch;
 

diff --git a/...preview/library/TextCrawlerImageTest.java → .../sample/library/TextCrawlerImageTest.java b/...preview/library/TextCrawlerImageTest.java → .../sample/library/TextCrawlerImageTest.java
@@ -1,7 +1,7 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import android.os.AsyncTask;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

diff --git a/...link/preview/library/TextCrawlerTest.java → ...eview/sample/library/TextCrawlerTest.java b/...link/preview/library/TextCrawlerTest.java → ...eview/sample/library/TextCrawlerTest.java
@@ -1,8 +1,8 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.leocardz.link.preview.library.url.UrlExtractionStrategy;
+import com.leocardz.linkpreview.sample.library.url.UrlExtractionStrategy;
 
 import org.jsoup.nodes.Document;
 import org.junit.Test;

diff --git a/library/src/main/AndroidManifest.xml → linkpreview/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml → linkpreview/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.leocardz.link.preview.library">
+    package="com.leocardz.linkpreview.sample.library">
 
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/...eview/library/BaseImagePickingStrategy.kt → ...ample/library/BaseImagePickingStrategy.kt b/...eview/library/BaseImagePickingStrategy.kt → ...ample/library/BaseImagePickingStrategy.kt
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
 import org.jsoup.nodes.Document
 import java.util.*

diff --git a/.../library/DefaultImagePickingStrategy.java → .../library/DefaultImagePickingStrategy.java b/.../library/DefaultImagePickingStrategy.java → .../library/DefaultImagePickingStrategy.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import org.jsoup.nodes.Document;
 

diff --git a/...preview/library/DowloadImageCallback.java → .../sample/library/DowloadImageCallback.java b/...preview/library/DowloadImageCallback.java → .../sample/library/DowloadImageCallback.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import android.graphics.Bitmap;
 import android.widget.ImageView;

diff --git a/...eocardz/link/preview/library/GetSource.kt → ...z/linkpreview/sample/library/GetSource.kt b/...eocardz/link/preview/library/GetSource.kt → ...z/linkpreview/sample/library/GetSource.kt
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
 /**
  * @author dhruvaraj nagarajan

diff --git a/...ink/preview/library/GetSourceAynscTask.kt → ...view/sample/library/GetSourceAynscTask.kt b/...ink/preview/library/GetSourceAynscTask.kt → ...view/sample/library/GetSourceAynscTask.kt
@@ -1,8 +1,8 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
 import android.os.AsyncTask
-import com.leocardz.link.preview.library.url.DefaultUrlExtractionStrategy
-import com.leocardz.link.preview.library.url.UrlExtractionStrategy
+import com.leocardz.linkpreview.sample.library.url.DefaultUrlExtractionStrategy
+import com.leocardz.linkpreview.sample.library.url.UrlExtractionStrategy
 
 /**
  * @author dhruvaraj nagarajan

diff --git a/...nk/preview/library/GetSourceObservable.kt → ...iew/sample/library/GetSourceObservable.kt b/...nk/preview/library/GetSourceObservable.kt → ...iew/sample/library/GetSourceObservable.kt
@@ -1,7 +1,7 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
-import com.leocardz.link.preview.library.url.DefaultUrlExtractionStrategy
-import com.leocardz.link.preview.library.url.UrlExtractionStrategy
+import com.leocardz.linkpreview.sample.library.url.DefaultUrlExtractionStrategy
+import com.leocardz.linkpreview.sample.library.url.UrlExtractionStrategy
 import io.reactivex.Observable
 
 /**

diff --git a/...rdz/link/preview/library/GetSourceSync.kt → ...nkpreview/sample/library/GetSourceSync.kt b/...rdz/link/preview/library/GetSourceSync.kt → ...nkpreview/sample/library/GetSourceSync.kt
@@ -1,7 +1,7 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
-import com.leocardz.link.preview.library.Util.extendedTrim
-import com.leocardz.link.preview.library.url.UrlExtractionStrategy
+import com.leocardz.linkpreview.sample.library.Util.extendedTrim
+import com.leocardz.linkpreview.sample.library.url.UrlExtractionStrategy
 import org.jsoup.Jsoup
 import org.jsoup.UnsupportedMimeTypeException
 import org.jsoup.nodes.Document

diff --git a/...k/preview/library/ImagePickingStrategy.kt → ...ew/sample/library/ImagePickingStrategy.kt b/...k/preview/library/ImagePickingStrategy.kt → ...ew/sample/library/ImagePickingStrategy.kt
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
 import org.jsoup.nodes.Document
 import java.util.*

diff --git a/.../preview/library/LinkPreviewCallback.java → ...w/sample/library/LinkPreviewCallback.java b/.../preview/library/LinkPreviewCallback.java → ...w/sample/library/LinkPreviewCallback.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 /**
  * Callback that is invoked with before and after the loading of a link preview

diff --git a/.../leocardz/link/preview/library/Regex.java → ...rdz/linkpreview/sample/library/Regex.java b/.../leocardz/link/preview/library/Regex.java → ...rdz/linkpreview/sample/library/Regex.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ardz/link/preview/library/SearchUrls.java → ...inkpreview/sample/library/SearchUrls.java b/...ardz/link/preview/library/SearchUrls.java → ...inkpreview/sample/library/SearchUrls.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import java.net.URL;
 import java.util.ArrayList;

diff --git a/...z/link/preview/library/SourceContent.java → ...preview/sample/library/SourceContent.java b/...z/link/preview/library/SourceContent.java → ...preview/sample/library/SourceContent.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library;
+package com.leocardz.linkpreview.sample.library;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...cardz/link/preview/library/TextCrawler.kt → ...linkpreview/sample/library/TextCrawler.kt b/...cardz/link/preview/library/TextCrawler.kt → ...linkpreview/sample/library/TextCrawler.kt
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
 import io.reactivex.Observable
 

diff --git a/...com/leocardz/link/preview/library/Util.kt → ...ocardz/linkpreview/sample/library/Util.kt b/...com/leocardz/link/preview/library/Util.kt → ...ocardz/linkpreview/sample/library/Util.kt
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library
+package com.leocardz.linkpreview.sample.library
 
 /**
  * @author dhruvaraj nagarajan

diff --git a/...ary/url/DefaultUrlExtractionStrategy.java → ...ary/url/DefaultUrlExtractionStrategy.java b/...ary/url/DefaultUrlExtractionStrategy.java → ...ary/url/DefaultUrlExtractionStrategy.java
@@ -1,7 +1,7 @@
-package com.leocardz.link.preview.library.url;
+package com.leocardz.linkpreview.sample.library.url;
 
-import com.leocardz.link.preview.library.SearchUrls;
-import com.leocardz.link.preview.library.TextCrawler;
+import com.leocardz.linkpreview.sample.library.SearchUrls;
+import com.leocardz.linkpreview.sample.library.TextCrawler;
 
 import java.util.List;
 

diff --git a/...ew/library/url/UrlExtractionStrategy.java → ...le/library/url/UrlExtractionStrategy.java b/...ew/library/url/UrlExtractionStrategy.java → ...le/library/url/UrlExtractionStrategy.java
@@ -1,4 +1,4 @@
-package com.leocardz.link.preview.library.url;
+package com.leocardz.linkpreview.sample.library.url;
 
 import java.util.List;
 

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':library'
+include ':app', ':linkpreview'