Skip to content

Commit

Permalink
Set *_DEPLOYMENT_TARGET in generator
Browse files Browse the repository at this point in the history 
This is needed to set it for resource bundles while unblocking the de-stringification of `xcode_target`.
  • Loading branch information
@brentleyjones
brentleyjones committed Jul 25, 2022
1 parent d200630 commit 94a2f36
Show file tree
Hide file tree
Showing 21 changed files with 238 additions and 256 deletions.
22 changes: 11 additions & 11 deletions examples/ios_app/test/fixtures/bwb_spec.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
"OS_IOS",
"DEBUG=1"
],
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_CFLAGS": [
"-fstack-protector",
"-Wall",
Expand Down Expand Up @@ -243,6 +242,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -280,7 +280,6 @@
"DEBUG_INFORMATION_FORMAT": "dwarf",
"ENABLE_BITCODE": false,
"GCC_OPTIMIZATION_LEVEL": "0",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"PRODUCT_BUNDLE_IDENTIFIER": "io.buildbuddy.example",
"SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
Expand Down Expand Up @@ -340,6 +339,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -381,7 +381,6 @@
"ENABLE_BITCODE": false,
"ENABLE_TESTABILITY": true,
"GCC_OPTIMIZATION_LEVEL": "0",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_SWIFT_FLAGS": "-Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all -static",
"PRODUCT_MODULE_NAME": "Example",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "DEBUG",
Expand Down Expand Up @@ -431,6 +430,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -471,7 +471,6 @@
"GCC_PREPROCESSOR_DEFINITIONS": [
"AWESOME"
],
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"PRODUCT_BUNDLE_IDENTIFIER": "io.buildbuddy.example.objctests",
"SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
Expand Down Expand Up @@ -525,6 +524,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -576,7 +576,6 @@
"DEBUG=1",
"AWESOME"
],
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_CFLAGS": [
"-fstack-protector",
"-Wall",
Expand Down Expand Up @@ -654,6 +653,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -694,7 +694,6 @@
"GCC_PREPROCESSOR_DEFINITIONS": [
"AWESOME"
],
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"PRODUCT_BUNDLE_IDENTIFIER": "io.buildbuddy.example.tests",
"SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
Expand Down Expand Up @@ -749,6 +748,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -792,7 +792,6 @@
"ENABLE_TESTABILITY": true,
"ENABLE_TESTING_SEARCH_PATHS": true,
"GCC_OPTIMIZATION_LEVEL": "0",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_SWIFT_FLAGS": "-Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all -Xcc -DAWESOME -static",
"PRODUCT_MODULE_NAME": "ExampleTests",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "DEBUG AWESOME",
Expand Down Expand Up @@ -847,6 +846,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -894,7 +894,6 @@
"DEBUG_INFORMATION_FORMAT": "dwarf",
"ENABLE_BITCODE": false,
"GCC_OPTIMIZATION_LEVEL": "0",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"PRODUCT_BUNDLE_IDENTIFIER": "io.buildbuddy.example.uitests",
"SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
Expand Down Expand Up @@ -942,6 +941,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -974,7 +974,6 @@
"ENABLE_TESTABILITY": true,
"ENABLE_TESTING_SEARCH_PATHS": true,
"GCC_OPTIMIZATION_LEVEL": "0",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_SWIFT_FLAGS": "-Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all -static",
"PRODUCT_MODULE_NAME": "ExampleUITests",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "DEBUG",
Expand Down Expand Up @@ -1011,6 +1010,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -1042,7 +1042,6 @@
"ENABLE_TESTABILITY": true,
"ENABLE_TESTING_SEARCH_PATHS": true,
"GCC_OPTIMIZATION_LEVEL": "0",
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_SWIFT_FLAGS": "-Xcc -O0 -Xcc -DDEBUG=1 -Xcc -fstack-protector -Xcc -fstack-protector-all -Xcc -DAWESOME -static",
"PRODUCT_MODULE_NAME": "TestingUtils",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "DEBUG AWESOME",
Expand Down Expand Up @@ -1085,6 +1084,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down Expand Up @@ -1121,7 +1121,6 @@
"OS_IOS",
"DEBUG=1"
],
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
"OTHER_CFLAGS": [
"-fstack-protector",
"-Wall",
Expand Down Expand Up @@ -1201,6 +1200,7 @@
"platform": {
"arch": "x86_64",
"environment": "Simulator",
"minimum_deployment_os_version": "15.0",
"minimum_os_version": "15.0",
"name": "iphonesimulator",
"os": "ios"
Expand Down
Loading

0 comments on commit 94a2f36

Please sign in to comment.