OCS Kotlin coroutines

ostelco · Dec 20, 2018 · d060643 · d060643
2 parents e65a0b7 + e0b2f8c
commit d060643
Show file tree

Hide file tree

Showing 52 changed files with 781 additions and 386 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.3.10-blue.svg)](http://kotlinlang.org/)
+[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.3.11-blue.svg)](http://kotlinlang.org/)
 [![Prime version](https://img.shields.io/github/tag/ostelco/ostelco-core.svg)](https://github.com/ostelco/ostelco-core/tags)
 [![GitHub license](https://img.shields.io/github/license/ostelco/ostelco-core.svg)](https://github.com/ostelco/ostelco-core/blob/master/LICENSE)
 

diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
 }

diff --git a/acceptance-tests/src/main/kotlin/org/ostelco/at/common/TestUser.kt b/acceptance-tests/src/main/kotlin/org/ostelco/at/common/TestUser.kt
@@ -38,4 +38,4 @@ fun createSubscription(email: String): String {
 }
 
 private val random = Random()
-fun randomInt(): Int = random.nextInt(999)
+fun randomInt(): Int = random.nextInt(99999)
diff --git a/admin-api/build.gradle b/admin-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/analytics-module/build.gradle b/analytics-module/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.3.10"
+    id "org.jetbrains.kotlin.jvm" version "1.3.11"
     id "java-library"
 }
 
@@ -9,5 +9,5 @@ dependencies {
     implementation "com.google.cloud:google-cloud-pubsub:$googleCloudVersion"
     implementation 'com.google.code.gson:gson:2.8.5'
 
-    testImplementation 'com.google.api:gax-grpc:1.35.0'
+    testImplementation 'com.google.api:gax-grpc:1.35.1'
 }
diff --git a/app-notifier/build.gradle b/app-notifier/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/auth-server/build.gradle b/auth-server/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"

diff --git a/bq-metrics-extractor/build.gradle b/bq-metrics-extractor/build.gradle
@@ -3,7 +3,7 @@ buildscript {
 }
 
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"
@@ -21,7 +21,7 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
   implementation "com.google.cloud:google-cloud-bigquery:$googleCloudVersion"
-  implementation 'io.prometheus:simpleclient_pushgateway:0.5.0'
+  implementation 'io.prometheus:simpleclient_pushgateway:0.6.0'
 
   runtimeOnly "io.dropwizard:dropwizard-json-logging:$dropwizardVersion"
 

diff --git a/build.gradle b/build.gradle
@@ -34,36 +34,36 @@ subprojects {
   ext {
     assertJVersion = "3.11.1"
     arrowVersion = "0.8.1"
-    beamVersion = "2.8.0"
+    beamVersion = "2.9.0"
     dropwizardVersion = "1.3.7"
-    firebaseVersion = "6.5.0"
-    googleCloudVersion = "1.53.0"
-    grpcVersion = "1.16.1"
+    firebaseVersion = "6.6.0"
+    googleCloudVersion = "1.56.0"
+    grpcVersion = "1.17.1"
     guavaVersion = "27.0.1-jre"
-    jacksonVersion = "2.9.7"
+    jacksonVersion = "2.9.8"
     javaxActivationVersion = "1.1.1"
     // Keeping it version 1.16.1 to be consistent with grpc via PubSub client lib
     // Keeping it version 1.16.1 to be consistent with netty via Firebase lib
     jaxbVersion = "2.3.1"
     junit5Version = "5.3.2"
-    kotlinVersion = "1.3.10"
+    kotlinVersion = "1.3.11"
     kotlinXCoroutinesVersion = "1.0.1"
     mockitoVersion = "2.23.4"
-    neo4jDriverVersion="1.7.1"
+    neo4jDriverVersion="1.7.2"
     neo4jVersion="3.5.0"
-    stripeVersion = "7.8.0"
+    stripeVersion = "7.10.0"
   }
 }
 
-//dependencyUpdates.resolutionStrategy {
-//  componentSelection { rules ->
-//    rules.all { ComponentSelection selection ->
-//      boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'redhat'].any { qualifier ->
-//        selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
-//      }
-//      if (rejected) {
-//        selection.reject('Release candidate')
-//      }
-//    }
-//  }
-//}
+dependencyUpdates.resolutionStrategy {
+  componentSelection { rules ->
+    rules.all { ComponentSelection selection ->
+      boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'redhat'].any { qualifier ->
+        selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+      }
+      if (rejected) {
+        selection.reject('Release candidate')
+      }
+    }
+  }
+}
diff --git a/client-api/build.gradle b/client-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.3.10"
+    id "org.jetbrains.kotlin.jvm" version "1.3.11"
     id "java-library"
 }
 

diff --git a/dataflow-pipelines/build.gradle b/dataflow-pipelines/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"

diff --git a/diameter-stack/build.gradle b/diameter-stack/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "signing"
   id "maven"

diff --git a/diameter-test/build.gradle b/diameter-test/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "signing"
   id "maven"

diff --git a/ext-auth-provider/build.gradle b/ext-auth-provider/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
 }

diff --git a/firebase-extensions/build.gradle b/firebase-extensions/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/firebase-store/build.gradle b/firebase-store/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/graphql/build.gradle b/graphql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/imei-lookup/build.gradle b/imei-lookup/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "idea"
 }

diff --git a/jersey/build.gradle b/jersey/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/model/build.gradle b/model/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 

diff --git a/neo4j-store/build.gradle b/neo4j-store/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }