Skip to content

Commit f8fbfd3

Browse files
authored
Merge pull request #26 from NickM-27/develop
Develop
2 parents eb553da + 76a8cc6 commit f8fbfd3

File tree

11 files changed

+313
-61
lines changed

11 files changed

+313
-61
lines changed

.idea/codeStyles/Project.xml

Lines changed: 109 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ On your module's `build.gradle` file add this statement to the `dependencies` se
1818

1919
```groovy
2020
dependencies {
21-
implementation 'com.nick.mowen.linkpreview:linkpreview:2.3'
21+
implementation 'com.nick.mowen.linkpreview:linkpreview:2.4'
2222
}
2323
```
2424

@@ -112,6 +112,9 @@ Contributions
112112

113113
Any contributions are welcome!
114114

115+
# Donations
116+
If you would like to donate / contribute to future development, you can [paypal me here](https://paypal.me/nickmowen)
117+
115118
License
116119
---
117120

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.20'
4+
ext.kotlin_version = '1.3.41'
55
repositories {
66
google()
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.0'
10+
classpath 'com.android.tools.build:gradle:3.5.0-beta05'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

13-
//For Library
13+
// For Library
1414
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
1515
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1616
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
android.enableJetifier=true
1010
android.useAndroidX=true
1111
org.gradle.jvmargs=-Xmx1536m
12+
kotlin.code.style=official
13+
kapt.incremental.apt=true
1214
# When configured, Gradle will run in incubating parallel mode.
1315
# This option should only be used with decoupled projects. More details, visit
1416
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Nov 18 09:11:25 MST 2018
1+
#Fri Jul 12 19:03:54 PDT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

linkpreview/build.gradle

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apply plugin: 'com.jfrog.bintray'
55
apply plugin: 'com.github.dcendents.android-maven'
66

77
android {
8-
compileSdkVersion 28
8+
compileSdkVersion 29
99
defaultConfig {
1010
minSdkVersion 19
11-
targetSdkVersion 28
12-
versionCode 18
13-
versionName "2.3"
11+
targetSdkVersion 29
12+
versionCode 19
13+
versionName "2.4"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616
buildTypes {
@@ -19,33 +19,41 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
packagingOptions {
23+
exclude 'META-INF/atomicfu.kotlin_module'
24+
}
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2229
dataBinding {
2330
enabled = true
2431
}
2532
}
2633

2734
dependencies {
2835

29-
//AndroidX
36+
// AndroidX
37+
implementation 'androidx.core:core-ktx:1.0.2'
3038
implementation 'androidx.browser:browser:1.0.0'
3139
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3240

33-
//Other
34-
implementation 'org.jsoup:jsoup:1.11.3'
35-
implementation 'com.github.bumptech.glide:glide:4.8.0'
41+
// Other
42+
implementation 'org.jsoup:jsoup:1.12.1'
43+
implementation 'com.github.bumptech.glide:glide:4.9.0'
3644

37-
//Kotlin
45+
// Kotlin
3846
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
39-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
40-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
41-
implementation 'androidx.core:core-ktx:1.0.1'
47+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2'
48+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2'
4249

43-
kapt 'com.github.bumptech.glide:compiler:4.8.0'
50+
// Annotation Processors
51+
kapt 'com.github.bumptech.glide:compiler:4.9.0'
4452

45-
//Testing libraries
53+
// Testing Libraries
4654
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.2.31'
47-
androidTestImplementation 'androidx.test:runner:1.1.1'
48-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
55+
androidTestImplementation 'androidx.test:runner:1.2.0'
56+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4957
}
5058

5159
ext {
@@ -55,7 +63,7 @@ ext {
5563

5664
publishedGroupId = 'com.nick.mowen.linkpreview'
5765
artifact = 'linkpreview'
58-
libraryVersion = '2.3'
66+
libraryVersion = '2.4'
5967
libraryDescription = 'A convenient view that shows a clickable preview of a link'
6068
siteUrl = 'https://github.com/NickM-27/LinkPreview'
6169
gitUrl = 'https://github.com/NickM-27/LinkPreview.git'

0 commit comments

Comments
 (0)