Changed versioning concept

paslavsky · Jul 10, 2020 · ba7a1ac · ba7a1ac
1 parent 1ae0ef5
commit ba7a1ac
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
+os: linux
+dist: bionic
 language: java
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -6,7 +8,7 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-script: "./gradlew build"
+script: "./gradlew -Pversion=$TRAVIS_TAG build"
 jdk:
 - openjdk8
 branches:

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ This guide shows how to setup [ktor-elastic](ktor-elastic/README.md)
     <dependency>
         <groupId>net.paslavsky</groupId>
         <artifactId>ktor-elastic</artifactId>
-        <version>1.3.2</version>
+        <version>${exktor.version}</version>
     </dependency>
 </dependencies>
 ```
@@ -43,7 +43,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'net.paslavsky:ktor-elastic:1.3.2'
+  implementation "net.paslavsky:ktor-elastic:$exktorVersion"
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,10 +11,18 @@ plugins {
     `maven-publish`
 }
 
+val ktor_version: String by project
+val _version = project.findProperty("version").let {
+    if ((it as? String).isNullOrBlank()) {
+        ktor_version
+    } else {
+        it!!
+    }
+}
+
 group = "net.paslavsky"
-version = "1.3.2"
+version = _version
 
-val ktor_version: String by project
 
 val Project.sourceSets: SourceSetContainer get() =
     (this as ExtensionAware).extensions.getByName("sourceSets") as SourceSetContainer
@@ -27,7 +35,7 @@ subprojects {
     }
 
     group = "net.paslavsky"
-    version = "1.3.2"
+    version = _version
 
     repositories {
         mavenCentral()

diff --git a/ktor-consul/README.md b/ktor-consul/README.md
@@ -21,7 +21,7 @@ integrate [Ktor HTTP clients](https://ktor.io/clients/) with Consul to discovery
     <dependency>
         <groupId>net.paslavsky</groupId>
         <artifactId>ktor-consul</artifactId>
-        <version>1.3.2</version>
+        <version>${exktor.version}</version>
     </dependency>
 </dependencies>
 ```
@@ -33,7 +33,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'net.paslavsky:ktor-consul:1.3.2'
+  implementation "net.paslavsky:ktor-consul:$exktorVersion"
 }
 ```
 

diff --git a/ktor-elastic/README.md b/ktor-elastic/README.md
@@ -21,7 +21,7 @@ client instance anywhere inside the `Application` context.
     <dependency>
         <groupId>net.paslavsky</groupId>
         <artifactId>ktor-elastic</artifactId>
-        <version>1.3.2</version>
+        <version>${exktor.version}</version>
     </dependency>
 </dependencies>
 ```
@@ -33,7 +33,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'net.paslavsky:ktor-elastic:1.3.2'
+  implementation "net.paslavsky:ktor-elastic:$exktorVersion"
 }
 ```
 

diff --git a/ktor-sql/README.md b/ktor-sql/README.md
@@ -20,7 +20,7 @@ This module allows to get up HikariCP connection pool at application start.
     <dependency>
         <groupId>net.paslavsky</groupId>
         <artifactId>ktor-sql</artifactId>
-        <version>1.3.2</version>
+        <version>${exktor.version}</version>
     </dependency>
 </dependencies>
 ```
@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'net.paslavsky:ktor-sql:1.3.2'
+  implementation "net.paslavsky:ktor-sql:$exktorVersion"
 }
 ```