Merge branch 'master' into av/android-lint

apps/multiplatform/android/build.gradle.kts

@@ -8,12 +8,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion(33)
+    namespace = "chat.simplex.app"
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "chat.simplex.app"
-        minSdkVersion(26)
+        minSdk = 26
-        targetSdkVersion(33)
+        targetSdk = 33
         // !!!
         // skip version code after release to F-Droid, as it uses two version codes
         versionCode = (extra["android.version_code"] as String).toInt()
@@ -56,8 +57,6 @@ android {
         freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
         freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi"
         freeCompilerArgs += "-opt-in=androidx.compose.material.ExperimentalMaterialApi"
-        freeCompilerArgs += "-opt-in=com.google.accompanist.insets.ExperimentalAnimatedInsets"
-        freeCompilerArgs += "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi"
         freeCompilerArgs += "-opt-in=kotlinx.serialization.InternalSerializationApi"
         freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
     }

apps/multiplatform/android/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="chat.simplex.app">
 
   <uses-feature android:name="android.hardware.camera" />
 

apps/multiplatform/build.gradle.kts

@@ -1,6 +1,4 @@
-import org.gradle.initialization.Environment.Properties
 import java.io.File
-import java.io.FileInputStream
 
 buildscript {
     val prop = java.util.Properties().apply {
@@ -33,7 +31,6 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:${rootProject.extra["gradle.plugin.version"]}")
         classpath(kotlin("gradle-plugin", version = rootProject.extra["kotlin.version"] as String))
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.3.2")
         classpath("dev.icerock.moko:resources-generator:0.22.3")
 
         // NOTE: Do not place your application dependencies here; they belong

apps/multiplatform/common/build.gradle.kts

@@ -22,7 +22,6 @@ kotlin {
         optIn("androidx.compose.foundation.ExperimentalFoundationApi")
         optIn("androidx.compose.ui.text.ExperimentalTextApi")
         optIn("androidx.compose.material.ExperimentalMaterialApi")
-        optIn("com.arkivanov.decompose.ExperimentalDecomposeApi")
         optIn("kotlinx.serialization.InternalSerializationApi")
         optIn("kotlinx.serialization.ExperimentalSerializationApi")
         optIn("androidx.compose.ui.ExperimentalComposeUiApi")
@@ -104,11 +103,11 @@ kotlin {
 }
 
 android {
-  compileSdkVersion(33)
+  namespace = "chat.simplex.common"
+  compileSdk = 33
   sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
   defaultConfig {
-    minSdkVersion(26)
+    minSdk = 26
-    targetSdkVersion(33)
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -123,11 +122,17 @@ android {
     // No other ways to exclude a file work but it's large and should be excluded
     kotlin.sourceSets["commonMain"].resources.exclude("/MR/fonts/NotoColorEmoji-Regular.ttf")
   }
+  kotlin {
+    jvmToolchain(8)
+  }
+  lint {
+    disable += "MissingTranslation"
+    disable += "ExtraTranslation"
+  }
 }
 
 multiplatformResources {
   multiplatformResourcesPackage = "chat.simplex.res"
-  //  multiplatformResourcesClassName = "MR"
 }
 
 buildConfig {

apps/multiplatform/common/src/androidMain/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="chat.simplex.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>