Merge branch 'release/v2.0.6'

Rukkaitto · Oct 7, 2022 · 4c4c9a8 · 4c4c9a8
2 parents f10573a + f5b8766
commit 4c4c9a8
Show file tree

Hide file tree

Showing 41 changed files with 1,104 additions and 800 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     splits {
         abi {
@@ -48,7 +48,7 @@ android {
     defaultConfig {
         applicationId "com.lucasgoudin.mobichan"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdk 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -65,7 +65,6 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
             debuggable false
@@ -75,6 +74,7 @@ android {
             zipAlignEnabled true
         }
     }
+    buildToolsVersion '31.0.0'
 }
 
 flutter {
@@ -83,7 +83,7 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0-rc01'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation platform('com.google.firebase:firebase-bom:29.1.0')
     implementation 'com.google.firebase:firebase-analytics'
 }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json
@@ -52,6 +52,7 @@
   "high_res_thumbnails_mobile": "High resolution thumbnails when using mobile data",
   "high_res_thumbnails_wifi": "High resolution thumbnails when connected to Wi-Fi",
   "mute_webm": "Mute WebMs by default",
+  "center_crop_image": "Center crop images",
   "report": "Report",
   "general": "General",
   "appearance": "Appearance",
@@ -66,5 +67,12 @@
     "two": "Loaded {} replies",
     "many": "Loaded {} replies",
     "other": "Loaded {} replies"
+  },
+  "loaded_threads": {
+    "zero": "",
+    "one": "Loaded {} thread",
+    "two": "Loaded {} threads",
+    "many": "Loaded {} threads",
+    "other": "Loaded {} threads"
   }
 }
diff --git a/assets/translations/fr-FR.json b/assets/translations/fr-FR.json
@@ -66,5 +66,12 @@
     "two": "{} réponses chargées.",
     "many": "{} réponses chargées.",
     "other": "{} réponses chargées."
+  },
+  "loaded_threads": {
+    "zero": "",
+    "one": "{} fil chargé.",
+    "two": "{} fils chargés.",
+    "many": "{} fils chargés.",
+    "other": "{} fils chargés."
   }
 }
diff --git a/assets/translations/nb-NO.json b/assets/translations/nb-NO.json
@@ -66,5 +66,12 @@
     "two": "Lastet {} svar",
     "many": "Lastet {} svar",
     "other": "Lastet {} svar"
+  },
+  "loaded_threads": {
+    "zero": "",
+    "one": "Lastet {} tråd",
+    "two": "Lastet {} tråder",
+    "many": "Lastet {} tråder",
+    "other": "Lastet {} tråder"
   }
 }
diff --git a/assets/translations/tr-TR.json b/assets/translations/tr-TR.json
@@ -66,5 +66,12 @@
     "two": "{} yanıt yüklendi",
     "many": "{} yanıt yüklendi",
     "other": "{} yanıt yüklendi"
+  },
+  "loaded_threads": {
+    "zero": "",
+    "one": "{} mesaj dizisi yüklendi",
+    "two": "{} mesaj dizisi yüklendi",
+    "many": "{} mesaj dizisi yüklendi",
+    "other": "{} mesaj dizisi yüklendi"
   }
 }
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
- platform :ios, '10.0'
+ platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'