Skip to content

Commit 04be669

Browse files
committed
Merge branch 'release/1.3.4'
2 parents 3cc7c99 + e9ff44c commit 04be669

File tree

10 files changed

+97
-76
lines changed

10 files changed

+97
-76
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Pure Java (java.util), no dependencies, very small method count.
1212
**Gradle:**
1313
```
1414
dependencies {
15-
implementation 'com.g00fy2:versioncompare:1.3.3'
15+
implementation 'com.g00fy2:versioncompare:1.3.4'
1616
}
1717
```
1818
**Maven:**
1919
```
2020
<dependency>
2121
<groupId>com.g00fy2</groupId>
2222
<artifactId>versioncompare</artifactId>
23-
<version>1.3.3</version>
23+
<version>1.3.4</version>
2424
</dependency>
2525
```
2626

@@ -89,7 +89,7 @@ suffix compare logic ||
8989
## Sample App
9090
![Image](https://raw.githubusercontent.com/G00fY2/version-compare/gh-pages/images/version_compare_sampleapp_framed.png)
9191

92-
**Try out the sample app to compare your version inputs: [Download APK](https://github.com/G00fY2/version-compare/releases/download/1.3.3/version-compare-1.3.3-sample.apk)**
92+
**Try out the sample app to compare your version inputs: [Download APK](https://github.com/G00fY2/version-compare/releases/download/1.3.4/version-compare-1.3.4-sample.apk)**
9393

9494
## License
9595
Copyright (C) 2018 Thomas Wirth

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.5.0'
7+
classpath 'com.android.tools.build:gradle:3.5.3'
88
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
99
}
1010
}

gradle.properties

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
# Project-wide Gradle settings.
2-
3-
# IDE (e.g. Android Studio) users:
4-
# Gradle settings configured through the IDE *will override*
5-
# any settings specified in this file.
6-
7-
# For more details on how to configure your build environment visit
8-
# http://www.gradle.org/docs/current/userguide/build_environment.html
9-
101
# Specifies the JVM arguments used for the daemon process.
112
# The setting is particularly useful for tweaking memory settings.
123
org.gradle.jvmargs=-Xmx1536m
134

14-
# When configured, Gradle will run in incubating parallel mode.
15-
# This option should only be used with decoupled projects. More details, visit
16-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
17-
# org.gradle.parallel=true
5+
# Use R8 in full mode instead of ProGuard compatibility mode.
6+
android.enableR8.fullMode=true

gradle/wrapper/gradle-wrapper.jar

4.95 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Nov 24 12:42:19 CET 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

gradlew

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

gradlew.bat

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

sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ android {
2626
dependencies {
2727
implementation project(':versioncompare')
2828

29-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3030
}
3131

3232
buildscript {
33-
ext.kotlin_version = '1.3.50'
33+
ext.kotlin_version = '1.3.61'
3434
repositories {
3535
mavenCentral()
3636
}

versioncompare/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
}
99

1010
jacoco {
11-
toolVersion = '0.8.4'
11+
toolVersion = '0.8.5'
1212
}
1313

1414
jacocoTestReport {

versioncompare/deploy.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ext {
1111
issueUrl = 'https://github.com/G00fY2/version-compare/issues'
1212
gitUrl = 'https://github.com/G00fY2/version-compare.git'
1313

14-
libraryVersion = '1.3.3'
14+
libraryVersion = '1.3.4'
1515

1616
developerId = 'g00fy2'
1717
developerName = 'Thomas Wirth'

0 commit comments

Comments
 (0)