Skip to content

Commit 4a8c5e3

Browse files
committed
Some improvements
1 parent e048fcf commit 4a8c5e3

File tree

13 files changed

+213
-81
lines changed

13 files changed

+213
-81
lines changed

flutter/craftd_widget/analysis_options.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

flutter/dart_analysis_options.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

flutter/sample/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

flutter/sample/.metadata

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
8-
channel: stable
7+
revision: "077b4a4ce10a07b82caa6897f0c626f9c0a3ac90"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
17-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
16+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
17+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
1818
- platform: android
19-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
20-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
19+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
20+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2121
- platform: ios
22-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
23-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
22+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
23+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2424
- platform: linux
25-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
26-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
25+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
26+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2727
- platform: macos
28-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
29-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
28+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
29+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
3030
- platform: web
31-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
32-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
31+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
32+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
3333
- platform: windows
34-
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
35-
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
34+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
35+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
3636

3737
# User provided section
3838

flutter/sample/analysis_options.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

flutter/sample/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
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>

flutter/sample/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
127127
97C146E61CF9000F007C117D /* Project object */ = {
128128
isa = PBXProject;
129129
attributes = {
130-
LastUpgradeCheck = 1300;
130+
LastUpgradeCheck = 1510;
131131
ORGANIZATIONNAME = "";
132132
TargetAttributes = {
133133
97C146ED1CF9000F007C117D = {
@@ -171,10 +171,12 @@
171171
/* Begin PBXShellScriptBuildPhase section */
172172
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
173173
isa = PBXShellScriptBuildPhase;
174+
alwaysOutOfDate = 1;
174175
buildActionMask = 2147483647;
175176
files = (
176177
);
177178
inputPaths = (
179+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
178180
);
179181
name = "Thin Binary";
180182
outputPaths = (
@@ -185,6 +187,7 @@
185187
};
186188
9740EEB61CF901F6004384FC /* Run Script */ = {
187189
isa = PBXShellScriptBuildPhase;
190+
alwaysOutOfDate = 1;
188191
buildActionMask = 2147483647;
189192
files = (
190193
);
@@ -272,7 +275,7 @@
272275
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
273276
GCC_WARN_UNUSED_FUNCTION = YES;
274277
GCC_WARN_UNUSED_VARIABLE = YES;
275-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
278+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
276279
MTL_ENABLE_DEBUG_INFO = NO;
277280
SDKROOT = iphoneos;
278281
SUPPORTED_PLATFORMS = iphoneos;
@@ -349,7 +352,7 @@
349352
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
350353
GCC_WARN_UNUSED_FUNCTION = YES;
351354
GCC_WARN_UNUSED_VARIABLE = YES;
352-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
355+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
353356
MTL_ENABLE_DEBUG_INFO = YES;
354357
ONLY_ACTIVE_ARCH = YES;
355358
SDKROOT = iphoneos;
@@ -398,7 +401,7 @@
398401
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
399402
GCC_WARN_UNUSED_FUNCTION = YES;
400403
GCC_WARN_UNUSED_VARIABLE = YES;
401-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
404+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
402405
MTL_ENABLE_DEBUG_INFO = NO;
403406
SDKROOT = iphoneos;
404407
SUPPORTED_PLATFORMS = iphoneos;

flutter/sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 4 additions & 1 deletion
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"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,11 +44,13 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
5052
debugServiceExtension = "internal"
53+
enableGPUValidationMode = "1"
5154
allowLocationSimulation = "YES">
5255
<BuildableProductRunnable
5356
runnableDebuggingMode = "0">

flutter/sample/ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cmake_minimum_required(VERSION 3.13)
2+
project(runner LANGUAGES CXX)
3+
4+
# Define the application target. To change its name, change BINARY_NAME in the
5+
# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
6+
# work.
7+
#
8+
# Any new source files that you add to the application should be added here.
9+
add_executable(${BINARY_NAME}
10+
"main.cc"
11+
"my_application.cc"
12+
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
13+
)
14+
15+
# Apply the standard set of build settings. This can be removed for applications
16+
# that need different build settings.
17+
apply_standard_settings(${BINARY_NAME})
18+
19+
# Add preprocessor definitions for the application ID.
20+
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
21+
22+
# Add dependency libraries. Add any application-specific dependencies here.
23+
target_link_libraries(${BINARY_NAME} PRIVATE flutter)
24+
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
25+
26+
target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")

0 commit comments

Comments
 (0)