Jitsi SDK 5.1 and update libs

Infomaniak · Aug 26, 2022 · 6b8bedb · 6b8bedb
1 parent 946a41d
commit 6b8bedb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,11 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
+*.apk
+*.aab
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "com.infomaniak.meet"
         minSdkVersion 23
-        targetSdkVersion 31
-        versionCode 17
-        versionName "2.4"
+        targetSdkVersion 32
+        versionCode 18
+        versionName "2.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,18 +30,19 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation "androidx.preference:preference-ktx:1.2.0"
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
 
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.github.razir.progressbutton:progressbutton:2.1.0'
 
-    implementation('org.jitsi.react:jitsi-meet-sdk:4.1.0')  {
+    implementation('org.jitsi.react:jitsi-meet-sdk:5.1.0')  {
         exclude group: 'com.google.firebase'
         exclude group: 'com.android.installreferrer'
     }

diff --git a/app/src/main/java/com/infomaniak/meet/MainActivity.kt b/app/src/main/java/com/infomaniak/meet/MainActivity.kt
@@ -191,7 +191,7 @@ class MainActivity : AppCompatActivity() {
                     .build()
 
                 val response = OkHttpClient.Builder().build().newCall(request).execute()
-                val bodyResponse = response.body()?.string()
+                val bodyResponse = response.body?.string()
 
                 result =
                     Gson().fromJson<ApiResponse<CodeRoomCredential>>(
@@ -213,8 +213,9 @@ class MainActivity : AppCompatActivity() {
             if (actionId == EditorInfo.IME_ACTION_DONE) {
                 callback.invoke()
                 true
+            } else {
+                false
             }
-            false
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,11 +17,10 @@ buildscript {
 
 allprojects {
     repositories {
-        maven {
-            url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"
-        }
         google()
-        jcenter()
+        maven { url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" }
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
     }
 }
 

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-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip