Merge pull request #26 from NickM-27/develop

Develop
NickM-27 · Jul 13, 2019 · f8fbfd3 · f8fbfd3
2 parents eb553da + 76a8cc6
commit f8fbfd3
Show file tree

Hide file tree

Showing 11 changed files with 313 additions and 61 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ On your module's `build.gradle` file add this statement to the `dependencies` se
 
 ```groovy
 dependencies {
-    implementation 'com.nick.mowen.linkpreview:linkpreview:2.3'
+    implementation 'com.nick.mowen.linkpreview:linkpreview:2.4'
 }
 ```
 
@@ -112,6 +112,9 @@ Contributions
 
 Any contributions are welcome!
 
+# Donations
+If you would like to donate / contribute to future development, you can [paypal me here](https://paypal.me/nickmowen)
+
 License
 ---
 

diff --git a/build.gradle b/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.3.41'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.0-beta05'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
-        //For Library
+        // For Library
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
+kotlin.code.style=official
+kapt.incremental.apt=true
 # 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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 18 09:11:25 MST 2018
+#Fri Jul 12 19:03:54 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/linkpreview/build.gradle b/linkpreview/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 18
-        versionName "2.3"
+        targetSdkVersion 29
+        versionCode 19
+        versionName "2.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -19,33 +19,41 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    packagingOptions {
+        exclude 'META-INF/atomicfu.kotlin_module'
+    }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
     dataBinding {
         enabled = true
     }
 }
 
 dependencies {
 
-    //AndroidX
+    // AndroidX
+    implementation 'androidx.core:core-ktx:1.0.2'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    //Other
-    implementation 'org.jsoup:jsoup:1.11.3'
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    // Other
+    implementation 'org.jsoup:jsoup:1.12.1'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 
-    //Kotlin
+    // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
-    implementation 'androidx.core:core-ktx:1.0.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2'
 
-    kapt 'com.github.bumptech.glide:compiler:4.8.0'
+    // Annotation Processors
+    kapt 'com.github.bumptech.glide:compiler:4.9.0'
 
-    //Testing libraries
+    // Testing Libraries
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.2.31'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 ext {
@@ -55,7 +63,7 @@ ext {
 
     publishedGroupId = 'com.nick.mowen.linkpreview'
     artifact = 'linkpreview'
-    libraryVersion = '2.3'
+    libraryVersion = '2.4'
     libraryDescription = 'A convenient view that shows a clickable preview of a link'
     siteUrl = 'https://github.com/NickM-27/LinkPreview'
     gitUrl = 'https://github.com/NickM-27/LinkPreview.git'