Skip to content

Commit 5faf00e

Browse files
authored
Merge pull request #330 from Manuito83/develop
Merge for v3.8.3
2 parents 32ac3ac + e23ca30 commit 5faf00e

File tree

160 files changed

+87225
-31445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+87225
-31445
lines changed

.env_example

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Torn
2+
SENDBIRD_APP_ID=
3+
SENDBIRD_APP_TOKEN=
4+
5+
# TSC
6+
TSC_HEADER_KEY=
7+
8+
# Info.plist (./ios/Runner)
9+
GOOGLE_CLIENT_ID=
10+
GOOGLE_REVERSED_CLIENT_ID=
11+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ firebase.json
8585
**/ios/Flutter/flutter_assets/
8686
**/ios/ServiceDefinitions.json
8787
**/ios/Runner/GeneratedPluginRegistrant.*
88+
**/ios/Flutter/Secrets.xcconfig
8889

8990
# Windows
9091
**/windows/flutter/ephemeral/

android/app/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id "com.android.application"
33
id "kotlin-android"
4+
id "org.jetbrains.kotlin.plugin.compose"
45
id "dev.flutter.flutter-gradle-plugin"
56
id "com.google.gms.google-services"
67
id "com.google.firebase.crashlytics"
@@ -16,12 +17,12 @@ if (localPropertiesFile.exists()) {
1617

1718
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1819
if (flutterVersionCode == null) {
19-
flutterVersionCode = '550'
20+
flutterVersionCode = '567'
2021
}
2122

2223
def flutterVersionName = localProperties.getProperty('flutter.versionName')
2324
if (flutterVersionName == null) {
24-
flutterVersionName = '3.8.2'
25+
flutterVersionName = '3.8.3'
2526
}
2627

2728
def keystoreProperties = new Properties()
@@ -31,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
3132
}
3233

3334
android {
34-
compileSdkVersion 34
35+
compileSdkVersion 36
3536

3637
namespace 'com.manuito.tornpda'
3738

@@ -42,7 +43,7 @@ android {
4243
defaultConfig {
4344
applicationId "com.manuito.tornpda"
4445
minSdkVersion 23
45-
targetSdkVersion 34
46+
targetSdkVersion 36
4647
multiDexEnabled true
4748
versionCode flutterVersionCode.toInteger()
4849
versionName flutterVersionName
@@ -106,7 +107,7 @@ dependencies {
106107
// See https://github.com/flutter/flutter/issues/110658 (local_notifications_plugin)
107108
implementation 'androidx.window:window:1.0.0'
108109
implementation 'androidx.window:window-java:1.0.0'
109-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
110+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
110111
}
111112

112113
configurations.all {

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
android:documentLaunchMode="never"
3333
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
3434
android:windowSoftInputMode="adjustResize"
35+
android:hardwareAccelerated="true"
36+
android:enableOnBackInvokedCallback="false"
3537
android:exported="true">
3638
<meta-data android:name="flutter_deeplinking_enabled"
3739
android:value="false" />

android/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ allprojects {
88
rootProject.buildDir = '../build'
99

1010
// TODO: delete? https://github.com/livekit/client-sdk-flutter/issues/569
11+
/*
1112
subprojects {
1213
afterEvaluate { project ->
1314
if (project.plugins.hasPlugin("com.android.application") ||
1415
project.plugins.hasPlugin("com.android.library")) {
1516
project.android {
16-
compileSdkVersion 35
17-
buildToolsVersion "35.0.0"
17+
compileSdkVersion 36
18+
buildToolsVersion "36.0.0"
1819
}
1920
}
2021
}
2122
}
23+
*/
2224

2325
// Needed for sendbird_chat 4.2.26 to build with no namespace issues
2426
subprojects {

0 commit comments

Comments
 (0)