Skip to content

Commit 4cfb013

Browse files
rayliverifiedrayliverified
committed
Generate Flutter Files v3.24.0
1 parent cf67cd2 commit 4cfb013

File tree

16 files changed

+56
-106
lines changed

16 files changed

+56
-106
lines changed

‎.metadata

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "bae5e49bc2a867403c43b2aae2de8f8c33b037e4"
7+
revision: "5874a72aa4c779a02553007c47dacbefba2374dc"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
17-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
16+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
17+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
1818
- platform: android
19-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
20-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
19+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
20+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
2121
- platform: ios
22-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
23-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
22+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
23+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
2424
- platform: linux
25-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
26-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
25+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
26+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
2727
- platform: macos
28-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
29-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
28+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
29+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
3030
- platform: web
31-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
32-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
31+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
32+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
3333
- platform: windows
34-
create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
35-
base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
34+
create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
35+
base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc
3636

3737
# User provided section
3838

‎android/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
1212
**/*.keystore
1313
**/*.jks

‎android/app/build.gradle

+15-38
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,44 @@
11
plugins {
22
id "com.android.application"
33
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
45
id "dev.flutter.flutter-gradle-plugin"
56
}
67

7-
def localProperties = new Properties()
8-
def localPropertiesFile = rootProject.file('local.properties')
9-
if (localPropertiesFile.exists()) {
10-
localPropertiesFile.withReader('UTF-8') { reader ->
11-
localProperties.load(reader)
12-
}
13-
}
14-
15-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
16-
if (flutterVersionCode == null) {
17-
flutterVersionCode = '1'
18-
}
19-
20-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
21-
if (flutterVersionName == null) {
22-
flutterVersionName = '1.0'
23-
}
24-
258
android {
26-
namespace "com.flutter_website"
27-
compileSdk flutter.compileSdkVersion
28-
ndkVersion flutter.ndkVersion
9+
namespace = "com.flutter_website"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = flutter.ndkVersion
2912

3013
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_1_8
32-
targetCompatibility JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
3316
}
3417

3518
kotlinOptions {
36-
jvmTarget = '1.8'
37-
}
38-
39-
sourceSets {
40-
main.java.srcDirs += 'src/main/kotlin'
19+
jvmTarget = JavaVersion.VERSION_1_8
4120
}
4221

4322
defaultConfig {
4423
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
45-
applicationId "com.flutter_website"
24+
applicationId = "com.flutter_website"
4625
// You can update the following values to match your application needs.
47-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
48-
minSdkVersion flutter.minSdkVersion
49-
targetSdkVersion flutter.targetSdkVersion
50-
versionCode flutterVersionCode.toInteger()
51-
versionName flutterVersionName
26+
// For more information, see: https://flutter.dev/to/review-gradle-config.
27+
minSdk = flutter.minSdkVersion
28+
targetSdk = flutter.targetSdkVersion
29+
versionCode = flutter.versionCode
30+
versionName = flutter.versionName
5231
}
5332

5433
buildTypes {
5534
release {
5635
// TODO: Add your own signing config for the release build.
5736
// Signing with the debug keys for now, so `flutter run --release` works.
58-
signingConfig signingConfigs.debug
37+
signingConfig = signingConfigs.debug
5938
}
6039
}
6140
}
6241

6342
flutter {
64-
source '../..'
43+
source = "../.."
6544
}
66-
67-
dependencies {}

‎android/app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:name=".MainActivity"
88
android:exported="true"
99
android:launchMode="singleTop"
10+
android:taskAffinity=""
1011
android:theme="@style/LaunchTheme"
1112
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1213
android:hardwareAccelerated="true"
@@ -31,7 +32,7 @@
3132
android:value="2" />
3233
</application>
3334
<!-- Required to query activities that can process text, see:
34-
https://developer.android.com/training/package-visibility?hl=en and
35+
https://developer.android.com/training/package-visibility and
3536
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
3637
3738
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

‎android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ allprojects {
55
}
66
}
77

8-
rootProject.buildDir = '../build'
8+
rootProject.buildDir = "../build"
99
subprojects {
1010
project.buildDir = "${rootProject.buildDir}/${project.name}"
1111
}
1212
subprojects {
13-
project.evaluationDependsOn(':app')
13+
project.evaluationDependsOn(":app")
1414
}
1515

1616
tasks.register("clean", Delete) {

‎android/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4G
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

‎android/settings.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ pluginManagement {
55
def flutterSdkPath = properties.getProperty("flutter.sdk")
66
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
77
return flutterSdkPath
8-
}
9-
settings.ext.flutterSdkPath = flutterSdkPath()
8+
}()
109

11-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1211

1312
repositories {
1413
google()

‎ios/Runner.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
"$(inherited)",
369369
"@executable_path/Frameworks",
370370
);
371-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite;
371+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite;
372372
PRODUCT_NAME = "$(TARGET_NAME)";
373373
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
374374
SWIFT_VERSION = 5.0;
@@ -384,7 +384,7 @@
384384
CURRENT_PROJECT_VERSION = 1;
385385
GENERATE_INFOPLIST_FILE = YES;
386386
MARKETING_VERSION = 1.0;
387-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite.RunnerTests;
387+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite.RunnerTests;
388388
PRODUCT_NAME = "$(TARGET_NAME)";
389389
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
390390
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -401,7 +401,7 @@
401401
CURRENT_PROJECT_VERSION = 1;
402402
GENERATE_INFOPLIST_FILE = YES;
403403
MARKETING_VERSION = 1.0;
404-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite.RunnerTests;
404+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite.RunnerTests;
405405
PRODUCT_NAME = "$(TARGET_NAME)";
406406
SWIFT_VERSION = 5.0;
407407
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -416,7 +416,7 @@
416416
CURRENT_PROJECT_VERSION = 1;
417417
GENERATE_INFOPLIST_FILE = YES;
418418
MARKETING_VERSION = 1.0;
419-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite.RunnerTests;
419+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite.RunnerTests;
420420
PRODUCT_NAME = "$(TARGET_NAME)";
421421
SWIFT_VERSION = 5.0;
422422
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -547,7 +547,7 @@
547547
"$(inherited)",
548548
"@executable_path/Frameworks",
549549
);
550-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite;
550+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite;
551551
PRODUCT_NAME = "$(TARGET_NAME)";
552552
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
553553
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -569,7 +569,7 @@
569569
"$(inherited)",
570570
"@executable_path/Frameworks",
571571
);
572-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite;
572+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite;
573573
PRODUCT_NAME = "$(TARGET_NAME)";
574574
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
575575
SWIFT_VERSION = 5.0;

‎ios/Runner/AppDelegate.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import UIKit
21
import Flutter
2+
import UIKit
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@
385385
CURRENT_PROJECT_VERSION = 1;
386386
GENERATE_INFOPLIST_FILE = YES;
387387
MARKETING_VERSION = 1.0;
388-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite.RunnerTests;
388+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite.RunnerTests;
389389
PRODUCT_NAME = "$(TARGET_NAME)";
390390
SWIFT_VERSION = 5.0;
391391
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_website.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/flutter_website";
@@ -399,7 +399,7 @@
399399
CURRENT_PROJECT_VERSION = 1;
400400
GENERATE_INFOPLIST_FILE = YES;
401401
MARKETING_VERSION = 1.0;
402-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite.RunnerTests;
402+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite.RunnerTests;
403403
PRODUCT_NAME = "$(TARGET_NAME)";
404404
SWIFT_VERSION = 5.0;
405405
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_website.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/flutter_website";
@@ -413,7 +413,7 @@
413413
CURRENT_PROJECT_VERSION = 1;
414414
GENERATE_INFOPLIST_FILE = YES;
415415
MARKETING_VERSION = 1.0;
416-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite.RunnerTests;
416+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite.RunnerTests;
417417
PRODUCT_NAME = "$(TARGET_NAME)";
418418
SWIFT_VERSION = 5.0;
419419
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_website.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/flutter_website";

‎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

‎macos/Runner/Configs/AppInfo.xcconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
PRODUCT_NAME = Flutter.dev
99

1010
// The application's bundle identifier
11-
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterWebsite
11+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterWebsite
1212

1313
// The copyright displayed in application information
14-
PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
14+
PRODUCT_COPYRIGHT = Copyright © 2024 com. All rights reserved.

‎macos/RunnerTests/RunnerTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import FlutterMacOS
21
import Cocoa
2+
import FlutterMacOS
33
import XCTest
44

55
class RunnerTests: XCTestCase {

‎web/index.html

+1-22
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,8 @@
3131

3232
<title>Flutter.dev</title>
3333
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
const serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4134
</head>
4235
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
36+
<script src="flutter_bootstrap.js" async></script>
5837
</body>
5938
</html>

‎windows/runner/runner.exe.manifest

-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
<application>
1010
<!-- Windows 10 and Windows 11 -->
1111
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
12-
<!-- Windows 8.1 -->
13-
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
14-
<!-- Windows 8 -->
15-
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
16-
<!-- Windows 7 -->
17-
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
1812
</application>
1913
</compatibility>
2014
</assembly>

‎windows/runner/utils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) {
4545
if (utf16_string == nullptr) {
4646
return std::string();
4747
}
48-
int target_length = ::WideCharToMultiByte(
48+
unsigned int target_length = ::WideCharToMultiByte(
4949
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
5050
-1, nullptr, 0, nullptr, nullptr)
5151
-1; // remove the trailing null character
5252
int input_length = (int)wcslen(utf16_string);
5353
std::string utf8_string;
54-
if (target_length <= 0 || target_length > utf8_string.max_size()) {
54+
if (target_length == 0 || target_length > utf8_string.max_size()) {
5555
return utf8_string;
5656
}
5757
utf8_string.resize(target_length);

0 commit comments

Comments
 (0)