gradle, gradle-tools and other minor upgrades

upgraded gradle from 4.6 to 4.10, with the necessary increments in android gradle tool and play-services (currently don't work anyway) protobuf-java:3.4.0@jar shouldn't need the @jar in bitlib only specifying a targetSdkVersion for libraries disables compatibility mode for certain features removed obsolete configurations and empty lint
mycelium-com · Feb 20, 2019 · 49ec624 · 49ec624
1 parent 6839f3a
commit 49ec624
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 42 deletions.
diff --git a/bitlib/build.gradle b/bitlib/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.protobuf:protobuf-java:3.4.0@jar'
+    implementation 'com.google.protobuf:protobuf-java:3.4.0'
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.5'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.5'
     testImplementation "junit:junit:$junitVersion"

diff --git a/btchip/build.gradle b/btchip/build.gradle
@@ -40,6 +40,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
+        targetSdkVersion 28
     }
 
     lintOptions {

diff --git a/btchip/lint.xml b/btchip/lint.xml
diff --git a/ext_settings.gradle b/ext_settings.gradle
@@ -1,13 +1,13 @@
 // keep that file in sync with ext_settings.gradle in the internal big repository
 ext {
+    // guavaArtifact = 'com.google.guava:guava:27.0.1-android'
     guavaArtifact = 'com.google.guava:guava:23.0-android'
-    androidBuildArtifact = 'com.android.tools.build:gradle:3.2.1'
-    slf4jVersion = '1.7.2'
+    androidBuildArtifact = 'com.android.tools.build:gradle:3.3.1'
     androidCompileSdkVersion = 28
     androidSdkBuildVersion = '28.0.3'
     androidSupportVersion = '28.0.0'
     junitVersion = '4.12'
-    kotlin_version = '1.3.10'
+    kotlin_version = '1.3.20'
     lifecycle_version = "1.1.1"
 
     projectRootDir = project.rootDir.getPath()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/libs/nordpol/build.gradle b/libs/nordpol/build.gradle
@@ -17,9 +17,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 28
     }
-//    we are just embedding the zxing lib here, we are not maintaining it.
     lintOptions {
         ignoreWarnings true
     }

diff --git a/mbw/build.gradle b/mbw/build.gradle
@@ -57,14 +57,14 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'com.squareup.retrofit2:converter-jackson:2.4.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
 
     // ViewModel and LiveData
     implementation "android.arch.lifecycle:extensions:$lifecycle_version"
 
-    //not upgrading. This will be removed from the core app
-    implementation 'com.google.android.gms:play-services-base:9.0.2'
-    implementation 'com.google.android.gms:play-services-gcm:9.0.2'
+    //not upgrading. This will be replaced with firebase
+    implementation 'com.google.android.gms:play-services-base:10.2.1'
+    implementation 'com.google.android.gms:play-services-gcm:10.2.1'
     implementation 'com.google.code.findbugs:annotations:3.0.1'
     kapt 'com.jakewharton:butterknife-compiler:8.5.1'
     implementation 'com.squareup:otto:1.3.4'
@@ -79,12 +79,14 @@ dependencies {
     implementation 'com.squareup.retrofit:retrofit:1.9.0'
     implementation 'com.squareup.wire:wire-runtime:1.6.1'
     implementation 'com.jakewharton:butterknife:8.5.1'
+    // implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    // TODO: migrate existing code (Glidera) to latest rxandroid
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'com.squareup.okhttp:okhttp:2.7.5'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'commons-codec:commons-codec:1.10'
     implementation 'com.google.protobuf:protobuf-java:3.4.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
 

diff --git a/mbw/src/main/java/com/mycelium/wallet/external/glidera/api/GlideraService.java b/mbw/src/main/java/com/mycelium/wallet/external/glidera/api/GlideraService.java
@@ -69,9 +69,6 @@
 import rx.functions.Func2;
 import rx.schedulers.Schedulers;
 
-/***
- * Olp
- */
 public class GlideraService {
    private final static String GLIDERA_SERVICE = "glideraService";
    /*
@@ -113,7 +110,7 @@ private GlideraService(@NonNull final NetworkParameters networkParameters) {
          clientId = MAINNET_CLIENT_ID;
       }
 
-      /**
+      /*
        * The Sha256 HMAC hash of the message. Use the secret matching the access_key to txid the message.
        * The message is the concatenation of the X-ACCESS-NONCE + URI of the request + message body JSON.
        * The final X-ACCESS-SIGNATURE is the HmacSha256 of the UTF-8 encoding of the message as a Hex encoded string
@@ -728,7 +725,6 @@ public Boolean call(Integer integer, Throwable throwable) {
                              }
                           }
 
-
                           return false;
                        }
                     })
@@ -754,5 +750,4 @@ public T call(T t) {
 
       abstract Observable<T> apiCall(OAuth1Response apiSecretToken);
    }
-
 }
diff --git a/mbwlib/build.gradle b/mbwlib/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation guavaArtifact
     // otto bus is deprecated in favor of rx but is cleaner with its annotations and type checking
     implementation 'com.squareup:otto:1.3.4'
-    implementation 'com.squareup.okhttp:okhttp:2.7.4'
+    implementation 'com.squareup.okhttp:okhttp:2.7.5'
     implementation 'com.squareup.wire:wire-runtime:1.6.1'
 
     implementation 'com.madgag.spongycastle:core:1.58.0.0'

diff --git a/trezor/build.gradle b/trezor/build.gradle
@@ -29,7 +29,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 28
     }
 
     lintOptions {

diff --git a/view/build.gradle b/view/build.gradle
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }

diff --git a/walletcore/build.gradle b/walletcore/build.gradle
@@ -37,12 +37,6 @@ buildscript {
     }
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"

diff --git a/walletmodel/build.gradle b/walletmodel/build.gradle
@@ -30,12 +30,6 @@ buildscript {
     }
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"

diff --git a/wapi/build.gradle b/wapi/build.gradle
@@ -35,9 +35,3 @@ buildscript {
 kapt {
     useBuildCache = true
 }
-
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}