diff --git a/.gitignore b/.gitignore index 49c66d891..fdc0ff852 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ freeline_project_description.json build/ .idea/ /gradle.properties +/app/gplay/release/output.json diff --git a/app/build.gradle b/app/build.gradle index ec1eb9ef6..99441c279 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,8 +47,8 @@ android { targetSdkVersion 29 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - versionCode 139 - versionName "9.0.0beta3" + versionCode 140 + versionName "9.0.0beta4" flavorDimensions "default" renderscriptTargetApi 19 diff --git a/app/gplay/release/output.json b/app/gplay/release/output.json deleted file mode 100644 index 635bb6f37..000000000 --- a/app/gplay/release/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":109,"versionName":"7.0.0beta1","enabled":true,"outputFile":"app-gplay-release.apk","fullName":"gplayRelease","baseName":"gplay-release"},"path":"app-gplay-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt index 2ec50f06b..8306fdd9d 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt @@ -115,7 +115,7 @@ fun createOkHttpClient( ): OkHttpClient { val httpClient = OkHttpClient.Builder() - httpClient.retryOnConnectionFailure(false) + httpClient.retryOnConnectionFailure(true) httpClient.connectTimeout(300, TimeUnit.SECONDS) httpClient.readTimeout(300, TimeUnit.SECONDS) httpClient.writeTimeout(300, TimeUnit.SECONDS) diff --git a/build.gradle b/build.gradle index ef03d4836..3b16ce069 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"