Skip to content

Commit e3ca775

Browse files
domesticmousedomesticmouse
authored
simple_shader: Clean up shaders/simple.frag, rebuild runners (#1715)
1 parent a828c09 commit e3ca775

File tree

24 files changed

+433
-26
lines changed

24 files changed

+433
-26
lines changed

‎simple_shader/.metadata

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,35 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: c07f7888888435fd9df505aa2efc38d3cf65681b
8-
channel: stable
7+
revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
8+
channel: beta
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
17-
base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
16+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
17+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
1818
- platform: android
19-
create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
20-
base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
19+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
20+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
2121
- platform: ios
22-
create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
23-
base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
22+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
23+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
2424
- platform: linux
25-
create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
26-
base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
25+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
26+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
2727
- platform: macos
28-
create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
29-
base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
28+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
29+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
30+
- platform: web
31+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
32+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
3033
- platform: windows
31-
create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
32-
base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
34+
create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
35+
base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f
3336

3437
# User provided section
3538

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.example.simple_shader">
3-
<application
3+
<application
44
android:label="simple_shader"
55
android:name="${applicationName}"
66
android:icon="@mipmap/ic_launcher">

‎simple_shader/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.2.0'
9+
classpath 'com.android.tools.build:gradle:7.3.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

‎simple_shader/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,19 @@
1313
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1414
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1515
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16+
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1617
/* End PBXBuildFile section */
1718

19+
/* Begin PBXContainerItemProxy section */
20+
331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
21+
isa = PBXContainerItemProxy;
22+
containerPortal = 97C146E61CF9000F007C117D /* Project object */;
23+
proxyType = 1;
24+
remoteGlobalIDString = 97C146ED1CF9000F007C117D;
25+
remoteInfo = Runner;
26+
};
27+
/* End PBXContainerItemProxy section */
28+
1829
/* Begin PBXCopyFilesBuildPhase section */
1930
9705A1C41CF9048500538489 /* Embed Frameworks */ = {
2031
isa = PBXCopyFilesBuildPhase;
@@ -42,6 +53,8 @@
4253
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4354
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4455
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56+
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
57+
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4558
/* End PBXFileReference section */
4659

4760
/* Begin PBXFrameworksBuildPhase section */
@@ -66,19 +79,29 @@
6679
name = Flutter;
6780
sourceTree = "<group>";
6881
};
82+
331C8082294A63A400263BE5 /* RunnerTests */ = {
83+
isa = PBXGroup;
84+
children = (
85+
331C807B294A618700263BE5 /* RunnerTests.swift */,
86+
);
87+
path = RunnerTests;
88+
sourceTree = "<group>";
89+
};
6990
97C146E51CF9000F007C117D = {
7091
isa = PBXGroup;
7192
children = (
7293
9740EEB11CF90186004384FC /* Flutter */,
7394
97C146F01CF9000F007C117D /* Runner */,
7495
97C146EF1CF9000F007C117D /* Products */,
96+
331C8082294A63A400263BE5 /* RunnerTests */,
7597
);
7698
sourceTree = "<group>";
7799
};
78100
97C146EF1CF9000F007C117D /* Products */ = {
79101
isa = PBXGroup;
80102
children = (
81103
97C146EE1CF9000F007C117D /* Runner.app */,
104+
331C8081294A63A400263BE5 /* RunnerTests.xctest */,
82105
);
83106
name = Products;
84107
sourceTree = "<group>";
@@ -101,6 +124,24 @@
101124
/* End PBXGroup section */
102125

103126
/* Begin PBXNativeTarget section */
127+
331C8080294A63A400263BE5 /* RunnerTests */ = {
128+
isa = PBXNativeTarget;
129+
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130+
buildPhases = (
131+
331C807D294A63A400263BE5 /* Sources */,
132+
331C807E294A63A400263BE5 /* Frameworks */,
133+
331C807F294A63A400263BE5 /* Resources */,
134+
);
135+
buildRules = (
136+
);
137+
dependencies = (
138+
331C8086294A63A400263BE5 /* PBXTargetDependency */,
139+
);
140+
name = RunnerTests;
141+
productName = RunnerTests;
142+
productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
143+
productType = "com.apple.product-type.bundle.unit-test";
144+
};
104145
97C146ED1CF9000F007C117D /* Runner */ = {
105146
isa = PBXNativeTarget;
106147
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
@@ -130,6 +171,10 @@
130171
LastUpgradeCheck = 1300;
131172
ORGANIZATIONNAME = "";
132173
TargetAttributes = {
174+
331C8080294A63A400263BE5 = {
175+
CreatedOnToolsVersion = 14.0;
176+
TestTargetID = 97C146ED1CF9000F007C117D;
177+
};
133178
97C146ED1CF9000F007C117D = {
134179
CreatedOnToolsVersion = 7.3.1;
135180
LastSwiftMigration = 1100;
@@ -150,11 +195,19 @@
150195
projectRoot = "";
151196
targets = (
152197
97C146ED1CF9000F007C117D /* Runner */,
198+
331C8080294A63A400263BE5 /* RunnerTests */,
153199
);
154200
};
155201
/* End PBXProject section */
156202

157203
/* Begin PBXResourcesBuildPhase section */
204+
331C807F294A63A400263BE5 /* Resources */ = {
205+
isa = PBXResourcesBuildPhase;
206+
buildActionMask = 2147483647;
207+
files = (
208+
);
209+
runOnlyForDeploymentPostprocessing = 0;
210+
};
158211
97C146EC1CF9000F007C117D /* Resources */ = {
159212
isa = PBXResourcesBuildPhase;
160213
buildActionMask = 2147483647;
@@ -176,6 +229,7 @@
176229
files = (
177230
);
178231
inputPaths = (
232+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
179233
);
180234
name = "Thin Binary";
181235
outputPaths = (
@@ -202,6 +256,14 @@
202256
/* End PBXShellScriptBuildPhase section */
203257

204258
/* Begin PBXSourcesBuildPhase section */
259+
331C807D294A63A400263BE5 /* Sources */ = {
260+
isa = PBXSourcesBuildPhase;
261+
buildActionMask = 2147483647;
262+
files = (
263+
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
264+
);
265+
runOnlyForDeploymentPostprocessing = 0;
266+
};
205267
97C146EA1CF9000F007C117D /* Sources */ = {
206268
isa = PBXSourcesBuildPhase;
207269
buildActionMask = 2147483647;
@@ -213,6 +275,14 @@
213275
};
214276
/* End PBXSourcesBuildPhase section */
215277

278+
/* Begin PBXTargetDependency section */
279+
331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
280+
isa = PBXTargetDependency;
281+
target = 97C146ED1CF9000F007C117D /* Runner */;
282+
targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
283+
};
284+
/* End PBXTargetDependency section */
285+
216286
/* Begin PBXVariantGroup section */
217287
97C146FA1CF9000F007C117D /* Main.storyboard */ = {
218288
isa = PBXVariantGroup;
@@ -305,6 +375,56 @@
305375
};
306376
name = Profile;
307377
};
378+
331C8088294A63A400263BE5 /* Debug */ = {
379+
isa = XCBuildConfiguration;
380+
baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */;
381+
buildSettings = {
382+
BUNDLE_LOADER = "$(TEST_HOST)";
383+
CODE_SIGN_STYLE = Automatic;
384+
CURRENT_PROJECT_VERSION = 1;
385+
GENERATE_INFOPLIST_FILE = YES;
386+
MARKETING_VERSION = 1.0;
387+
PRODUCT_BUNDLE_IDENTIFIER = com.example.simpleShader.RunnerTests;
388+
PRODUCT_NAME = "$(TARGET_NAME)";
389+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
390+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
391+
SWIFT_VERSION = 5.0;
392+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
393+
};
394+
name = Debug;
395+
};
396+
331C8089294A63A400263BE5 /* Release */ = {
397+
isa = XCBuildConfiguration;
398+
baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */;
399+
buildSettings = {
400+
BUNDLE_LOADER = "$(TEST_HOST)";
401+
CODE_SIGN_STYLE = Automatic;
402+
CURRENT_PROJECT_VERSION = 1;
403+
GENERATE_INFOPLIST_FILE = YES;
404+
MARKETING_VERSION = 1.0;
405+
PRODUCT_BUNDLE_IDENTIFIER = com.example.simpleShader.RunnerTests;
406+
PRODUCT_NAME = "$(TARGET_NAME)";
407+
SWIFT_VERSION = 5.0;
408+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
409+
};
410+
name = Release;
411+
};
412+
331C808A294A63A400263BE5 /* Profile */ = {
413+
isa = XCBuildConfiguration;
414+
baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */;
415+
buildSettings = {
416+
BUNDLE_LOADER = "$(TEST_HOST)";
417+
CODE_SIGN_STYLE = Automatic;
418+
CURRENT_PROJECT_VERSION = 1;
419+
GENERATE_INFOPLIST_FILE = YES;
420+
MARKETING_VERSION = 1.0;
421+
PRODUCT_BUNDLE_IDENTIFIER = com.example.simpleShader.RunnerTests;
422+
PRODUCT_NAME = "$(TARGET_NAME)";
423+
SWIFT_VERSION = 5.0;
424+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
425+
};
426+
name = Profile;
427+
};
308428
97C147031CF9000F007C117D /* Debug */ = {
309429
isa = XCBuildConfiguration;
310430
buildSettings = {
@@ -460,6 +580,16 @@
460580
/* End XCBuildConfiguration section */
461581

462582
/* Begin XCConfigurationList section */
583+
331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
584+
isa = XCConfigurationList;
585+
buildConfigurations = (
586+
331C8088294A63A400263BE5 /* Debug */,
587+
331C8089294A63A400263BE5 /* Release */,
588+
331C808A294A63A400263BE5 /* Profile */,
589+
);
590+
defaultConfigurationIsVisible = 0;
591+
defaultConfigurationName = Release;
592+
};
463593
97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
464594
isa = XCConfigurationList;
465595
buildConfigurations = (

‎simple_shader/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@
3737
</BuildableReference>
3838
</MacroExpansion>
3939
<Testables>
40+
<TestableReference
41+
skipped = "NO"
42+
parallelizable = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "331C8080294A63A400263BE5"
46+
BuildableName = "RunnerTests.xctest"
47+
BlueprintName = "RunnerTests"
48+
ReferencedContainer = "container:Runner.xcodeproj">
49+
</BuildableReference>
50+
</TestableReference>
4051
</Testables>
4152
</TestAction>
4253
<LaunchAction

‎simple_shader/ios/RunnerTests/RunnerTests.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Flutter
2+
import UIKit
3+
import XCTest
4+
5+
class RunnerTests: XCTestCase {
6+
7+
func testExample() {
8+
// If you add code to the Runner application, consider adding tests here.
9+
// See https://developer.apple.com/documentation/xctest for more information about using XCTest.
10+
}
11+
12+
}

‎simple_shader/linux/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ set_target_properties(${BINARY_NAME}
8686
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
8787
)
8888

89+
8990
# Generated plugin build rules, which manage building the plugins and adding
9091
# them to the application.
9192
include(flutter/generated_plugins.cmake)

0 commit comments

Comments
 (0)