Parcourir la source

Merge pull request #1148 from nextcloud/0d2fdependabot/gradle/kotlinVersion-1.4.32

Bump kotlinVersion from 1.3.50 to 1.4.32
Andy Scherzinger il y a 4 ans
Parent
commit
b15dd5b979

+ 2 - 2
app/build.gradle

@@ -277,13 +277,13 @@ dependencies {
     implementation 'com.github.tobiaskaminsky:ImagePicker:extraFile-SNAPSHOT'
     implementation 'com.github.tobiaskaminsky:ImagePicker:extraFile-SNAPSHOT'
     implementation 'com.elyeproj.libraries:loaderviewlibrary:2.0.0'
     implementation 'com.elyeproj.libraries:loaderviewlibrary:2.0.0'
 
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation 'org.mockito:mockito-core:3.9.0'
     testImplementation "org.powermock:powermock-core:${powermockVersion}"
     testImplementation "org.powermock:powermock-core:${powermockVersion}"
     testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
     testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
     testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
     testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
 
 
-    androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
+    androidTestImplementation ('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     })
     findbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
     findbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'

+ 1 - 2
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java

@@ -329,7 +329,6 @@ public class MagicPeerConnectionWrapper {
     }
     }
 
 
     private class MagicPeerConnectionObserver implements PeerConnection.Observer {
     private class MagicPeerConnectionObserver implements PeerConnection.Observer {
-        private final String TAG = "MagicPeerConnectionObserver";
 
 
         @Override
         @Override
         public void onSignalingChange(PeerConnection.SignalingState signalingState) {
         public void onSignalingChange(PeerConnection.SignalingState signalingState) {
@@ -425,7 +424,7 @@ public class MagicPeerConnectionWrapper {
     }
     }
 
 
     private class MagicSdpObserver implements SdpObserver {
     private class MagicSdpObserver implements SdpObserver {
-        private final String TAG = "MagicSdpObserver";
+        private static final String TAG = "MagicSdpObserver";
 
 
         @Override
         @Override
         public void onCreateFailure(String s) {
         public void onCreateFailure(String s) {

+ 1 - 1
build.gradle

@@ -22,7 +22,7 @@
 buildscript {
 buildscript {
 
 
     ext {
     ext {
-        kotlinVersion = '1.3.50'
+        kotlinVersion = '1.4.32'
     }
     }
 
 
     repositories {
     repositories {