Merge pull request #17 from comapi/dev

merge dev to master

Author: MarcinSwierczek

COMAPI/build.gradle

@@ -4,18 +4,22 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
-        classpath 'com.google.gms:google-services:3.1.1'
+        classpath 'com.google.gms:google-services:4.0.1'
 
         // For test coverage
         classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3"
         classpath 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
 
-        classpath 'me.tatarka:gradle-retrolambda:3.2.4'
+        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
     }
 }
 
@@ -27,16 +31,12 @@ allprojects {
             url 'http://clojars.org/repo'
         }
         maven {
-            url 'https://maven.google.com'
+            url 'https://maven.google.com/'
+            name 'Google'
         }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-
-// Running 'gradle wrapper' will generate gradlew
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.4.1'
 }

COMAPI/foundation/build.gradle

@@ -3,12 +3,12 @@ apply from: 'version.gradle'
 apply from: 'code_coverage.gradle'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 3
         versionName foundationVersion
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -37,31 +37,33 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    /* Android */
-    compile 'com.android.support:appcompat-v7:26.1.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+
     /* testing */
-    testCompile 'junit:junit:4.12'
-    androidTestCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.2.2'
-    testCompile 'org.robolectric:shadows-play-services:3.2.2'
-    testCompile 'org.robolectric:shadows-support-v4:3.2.2'
-    androidTestCompile 'com.android.support.test:runner:1.0.1'
-    androidTestCompile 'com.android.support.test:rules:1.0.1'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.9.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:3.4.2'
+    testImplementation 'org.robolectric:shadows-play-services:3.3.2'
+    testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:3.9.0'
     /* Rx */
-    compile 'io.reactivex:rxjava:1.3.3'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
+    implementation 'io.reactivex:rxjava:1.3.3'
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
     /* Network */
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+
     /*FCM*/
-    compile 'com.google.android.gms:play-services-base:11.6.2'
-    compile 'com.google.firebase:firebase-messaging:11.6.2'
+    //noinspection GradleCompatible warning disabled (seems to be caused by internal firebase-messaging dependencies versioning)
+    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation 'com.google.android.gms:play-services-base:16.1.0'
+
     /*Sockets*/
-    compile 'com.neovisionaries:nv-websocket-client:2.3'
+    implementation 'com.neovisionaries:nv-websocket-client:2.3'
 }
 
 /*
@@ -83,6 +85,11 @@ def localReleaseDest = "${buildDir}/release/${version}"
 task androidJavadocs(type: Javadoc, overwrite: true) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    options.links("http://docs.oracle.com/javase/7/docs/api/")
+    options.linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+    exclude '**/BuildConfig.java'
+    exclude '**/R.java'
+    failOnError = false
 }
 
 task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
@@ -185,9 +192,4 @@ generateRelease.dependsOn(zipRelease)
 artifacts {
     archives androidSourcesJar
     archives androidJavadocsJar
-}
-
-apply plugin: 'me.tatarka.retrolambda'
-retrolambda {
-    javaVersion JavaVersion.VERSION_1_7
 }

COMAPI/foundation/code_coverage.gradle

@@ -69,12 +69,15 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "testDebugUnitTest") {
             classesPath = 'foundation/build/intermediates/classes/debug'
         }
 
-        new File(classesPath).eachFileRecurse { file ->
-            if (file.name.contains('$$')) {
-                def oldPath = file.path
-                def newPath = oldPath.replace('$$', '$')
-                file.renameTo(newPath)
-                renamedFilesMap[newPath] = oldPath
+        File dir = new File(classesPath)
+        if (dir.exists()) {
+            dir.eachFileRecurse { file ->
+                if (file.name.contains('$$')) {
+                    def oldPath = file.path
+                    def newPath = oldPath.replace('$$', '$')
+                    file.renameTo(newPath)
+                    renamedFilesMap[newPath] = oldPath
+                }
             }
         }
     }