Skip to content

Commit 6d57916

Browse files
tateminMinTate
tatemin
authored and
MinTate
committed
【API-Example】Updates supported SDK version to Flutter 3.24
1 parent 1aed756 commit 6d57916

File tree

16 files changed

+278
-120
lines changed

16 files changed

+278
-120
lines changed

‎TRTC-API-Example/android/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 31
28+
compileSdk 34
2929

3030
compileOptions {
3131
sourceCompatibility JavaVersion.VERSION_1_8
@@ -35,7 +35,7 @@ android {
3535
defaultConfig {
3636
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3737
applicationId "com.example.trtc_api_example"
38-
minSdkVersion 18
38+
minSdkVersion flutter.minSdkVersion
3939
targetSdkVersion 31
4040
versionCode flutterVersionCode.toInteger()
4141
versionName flutterVersionName
@@ -55,4 +55,4 @@ flutter {
5555
}
5656
dependencies {
5757
// api "com.blankj:utilcode:1.25.9"
58-
}
58+
}

‎TRTC-API-Example/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ subprojects {
2222
project.evaluationDependsOn(':app')
2323
}
2424

25-
task clean(type: Delete) {
25+
tasks.register("clean", Delete) {
2626
delete rootProject.buildDir
2727
}

‎TRTC-API-Example/ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎TRTC-API-Example/ios/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎TRTC-API-Example/ios/Runner.xcodeproj/project.pbxproj

+35-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -231,6 +231,7 @@
231231
9705A1C41CF9048500538489 /* Embed Frameworks */,
232232
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
233233
14A64B896D83BF48C983A860 /* [CP] Embed Pods Frameworks */,
234+
3E8B0677FF724084B0569468 /* [CP] Copy Pods Resources */,
234235
);
235236
buildRules = (
236237
);
@@ -264,7 +265,7 @@
264265
97C146E61CF9000F007C117D /* Project object */ = {
265266
isa = PBXProject;
266267
attributes = {
267-
LastUpgradeCheck = 1300;
268+
LastUpgradeCheck = 1510;
268269
ORGANIZATIONNAME = "";
269270
TargetAttributes = {
270271
97C146ED1CF9000F007C117D = {
@@ -360,10 +361,12 @@
360361
};
361362
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
362363
isa = PBXShellScriptBuildPhase;
364+
alwaysOutOfDate = 1;
363365
buildActionMask = 2147483647;
364366
files = (
365367
);
366368
inputPaths = (
369+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
367370
);
368371
name = "Thin Binary";
369372
outputPaths = (
@@ -372,8 +375,26 @@
372375
shellPath = /bin/sh;
373376
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
374377
};
378+
3E8B0677FF724084B0569468 /* [CP] Copy Pods Resources */ = {
379+
isa = PBXShellScriptBuildPhase;
380+
buildActionMask = 2147483647;
381+
files = (
382+
);
383+
inputFileListPaths = (
384+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
385+
);
386+
name = "[CP] Copy Pods Resources";
387+
outputFileListPaths = (
388+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
389+
);
390+
runOnlyForDeploymentPostprocessing = 0;
391+
shellPath = /bin/sh;
392+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
393+
showEnvVarsInLog = 0;
394+
};
375395
9740EEB61CF901F6004384FC /* Run Script */ = {
376396
isa = PBXShellScriptBuildPhase;
397+
alwaysOutOfDate = 1;
377398
buildActionMask = 2147483647;
378399
files = (
379400
);
@@ -488,10 +509,10 @@
488509
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
489510
CLANG_ENABLE_MODULES = YES;
490511
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
491-
CODE_SIGN_STYLE = Manual;
512+
CODE_SIGN_IDENTITY = "Apple Development";
513+
CODE_SIGN_STYLE = Automatic;
492514
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
493-
DEVELOPMENT_TEAM = FN2V63AD2J;
494-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8A3GH6Q4W;
515+
DEVELOPMENT_TEAM = BSAPB3K3R7;
495516
ENABLE_BITCODE = NO;
496517
INFOPLIST_FILE = Runner/Info.plist;
497518
LD_RUNPATH_SEARCH_PATHS = (
@@ -500,8 +521,7 @@
500521
);
501522
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtc.api.demo.ios;
502523
PRODUCT_NAME = "$(TARGET_NAME)";
503-
PROVISIONING_PROFILE_SPECIFIER = com.tencent.trtc.api.demo.ios_Development_SignProvision;
504-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = abyWildcardDev;
524+
PROVISIONING_PROFILE_SPECIFIER = "";
505525
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
506526
SWIFT_VERSION = 5.0;
507527
VERSIONING_SYSTEM = "apple-generic";
@@ -624,10 +644,10 @@
624644
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
625645
CLANG_ENABLE_MODULES = YES;
626646
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
627-
CODE_SIGN_STYLE = Manual;
647+
CODE_SIGN_IDENTITY = "Apple Development";
648+
CODE_SIGN_STYLE = Automatic;
628649
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
629-
DEVELOPMENT_TEAM = FN2V63AD2J;
630-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8A3GH6Q4W;
650+
DEVELOPMENT_TEAM = BSAPB3K3R7;
631651
ENABLE_BITCODE = NO;
632652
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
633653
INFOPLIST_FILE = Runner/Info.plist;
@@ -637,8 +657,7 @@
637657
);
638658
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtc.api.demo.ios;
639659
PRODUCT_NAME = "$(TARGET_NAME)";
640-
PROVISIONING_PROFILE_SPECIFIER = com.tencent.trtc.api.demo.ios_Development_SignProvision;
641-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = abyWildcardDev;
660+
PROVISIONING_PROFILE_SPECIFIER = "";
642661
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
643662
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
644663
SWIFT_VERSION = 5.0;
@@ -653,10 +672,10 @@
653672
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
654673
CLANG_ENABLE_MODULES = YES;
655674
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
656-
CODE_SIGN_STYLE = Manual;
675+
CODE_SIGN_IDENTITY = "Apple Development";
676+
CODE_SIGN_STYLE = Automatic;
657677
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
658-
DEVELOPMENT_TEAM = FN2V63AD2J;
659-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8A3GH6Q4W;
678+
DEVELOPMENT_TEAM = BSAPB3K3R7;
660679
ENABLE_BITCODE = NO;
661680
INFOPLIST_FILE = Runner/Info.plist;
662681
LD_RUNPATH_SEARCH_PATHS = (
@@ -665,8 +684,7 @@
665684
);
666685
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtc.api.demo.ios;
667686
PRODUCT_NAME = "$(TARGET_NAME)";
668-
PROVISIONING_PROFILE_SPECIFIER = com.tencent.trtc.api.demo.ios_Development_SignProvision;
669-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = abyWildcardDev;
687+
PROVISIONING_PROFILE_SPECIFIER = "";
670688
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
671689
SWIFT_VERSION = 5.0;
672690
VERSIONING_SYSTEM = "apple-generic";

‎TRTC-API-Example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎TRTC-API-Example/ios/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import tencent_trtc_cloud
44
import TXCustomBeautyProcesserPlugin
55
import TXLiteAVSDK_Professional
66

7-
@UIApplicationMain
7+
@main
88
@objc class AppDelegate: FlutterAppDelegate {
99

1010
var channel: FlutterMethodChannel?

‎TRTC-API-Example/ios/Runner/Info.plist

+2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,7 @@
5151
<false/>
5252
<key>CADisableMinimumFrameDurationOnPhone</key>
5353
<true/>
54+
<key>UIApplicationSupportsIndirectInputEvents</key>
55+
<true/>
5456
</dict>
5557
</plist>

‎TRTC-API-Example/macos/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.11'
1+
platform :osx, '10.14'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎TRTC-API-Example/macos/Runner.xcodeproj/project.pbxproj

+24-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -188,6 +188,7 @@
188188
33CC110E2044A8840003C045 /* Bundle Framework */,
189189
3399D490228B24CF009A79C7 /* ShellScript */,
190190
6331CDCB9B031D2A11BE1921 /* [CP] Embed Pods Frameworks */,
191+
50ACCE608088C86CA92CC253 /* [CP] Copy Pods Resources */,
191192
);
192193
buildRules = (
193194
);
@@ -206,7 +207,7 @@
206207
isa = PBXProject;
207208
attributes = {
208209
LastSwiftUpdateCheck = 0920;
209-
LastUpgradeCheck = 0930;
210+
LastUpgradeCheck = 1510;
210211
ORGANIZATIONNAME = "";
211212
TargetAttributes = {
212213
33CC10EC2044A3C60003C045 = {
@@ -259,6 +260,7 @@
259260
/* Begin PBXShellScriptBuildPhase section */
260261
3399D490228B24CF009A79C7 /* ShellScript */ = {
261262
isa = PBXShellScriptBuildPhase;
263+
alwaysOutOfDate = 1;
262264
buildActionMask = 2147483647;
263265
files = (
264266
);
@@ -294,6 +296,23 @@
294296
shellPath = /bin/sh;
295297
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
296298
};
299+
50ACCE608088C86CA92CC253 /* [CP] Copy Pods Resources */ = {
300+
isa = PBXShellScriptBuildPhase;
301+
buildActionMask = 2147483647;
302+
files = (
303+
);
304+
inputFileListPaths = (
305+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
306+
);
307+
name = "[CP] Copy Pods Resources";
308+
outputFileListPaths = (
309+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
310+
);
311+
runOnlyForDeploymentPostprocessing = 0;
312+
shellPath = /bin/sh;
313+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
314+
showEnvVarsInLog = 0;
315+
};
297316
5D2A58BE40A69C5C41D38DC3 /* [CP] Check Pods Manifest.lock */ = {
298317
isa = PBXShellScriptBuildPhase;
299318
buildActionMask = 2147483647;
@@ -407,7 +426,7 @@
407426
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
408427
GCC_WARN_UNUSED_FUNCTION = YES;
409428
GCC_WARN_UNUSED_VARIABLE = YES;
410-
MACOSX_DEPLOYMENT_TARGET = 10.11;
429+
MACOSX_DEPLOYMENT_TARGET = 10.14;
411430
MTL_ENABLE_DEBUG_INFO = NO;
412431
SDKROOT = macosx;
413432
SWIFT_COMPILATION_MODE = wholemodule;
@@ -486,7 +505,7 @@
486505
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
487506
GCC_WARN_UNUSED_FUNCTION = YES;
488507
GCC_WARN_UNUSED_VARIABLE = YES;
489-
MACOSX_DEPLOYMENT_TARGET = 10.11;
508+
MACOSX_DEPLOYMENT_TARGET = 10.14;
490509
MTL_ENABLE_DEBUG_INFO = YES;
491510
ONLY_ACTIVE_ARCH = YES;
492511
SDKROOT = macosx;
@@ -533,7 +552,7 @@
533552
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
534553
GCC_WARN_UNUSED_FUNCTION = YES;
535554
GCC_WARN_UNUSED_VARIABLE = YES;
536-
MACOSX_DEPLOYMENT_TARGET = 10.11;
555+
MACOSX_DEPLOYMENT_TARGET = 10.14;
537556
MTL_ENABLE_DEBUG_INFO = NO;
538557
SDKROOT = macosx;
539558
SWIFT_COMPILATION_MODE = wholemodule;

‎TRTC-API-Example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎TRTC-API-Example/macos/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true

0 commit comments

Comments
 (0)