Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Update to build with Xcode 13.4.1
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 468022196
  • Loading branch information
@DavidGoldman @ivanhernandez13
DavidGoldman authored and ivanhernandez13 committed Aug 24, 2022
1 parent e52359d commit d8c299b
Show file tree
Hide file tree
Showing 19 changed files with 155 additions and 155 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Run `build_and_run.sh`. This will install Tulsi.app inside `$HOME/Applications`

* `-b`: Bazel binary that Tulsi should use to build and install the app (Default is `bazel`)
* `-d`: The folder where to install the Tulsi app into (Default is `$HOME/Applications`)
* `-x`: The Xcode version Tulsi should be built for (Default is `13.2.1`)
* `-x`: The Xcode version Tulsi should be built for (Default is `13.4.1`)


## Notes
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "build_bazel_rules_apple",
sha256 = "a5f00fd89eff67291f6cd3efdc8fad30f4727e6ebb90718f3f05bbf3c3dd5ed7",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz",
sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
url = "https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz",
)

load(
Expand Down
2 changes: 1 addition & 1 deletion build_and_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -eu

unzip_dir="$HOME/Applications"
bazel_path="bazel"
xcode_version="13.2.1"
xcode_version="13.4.1"

while getopts ":b:d:x:h" opt; do
case ${opt} in
Expand Down
2 changes: 1 addition & 1 deletion src/TulsiGeneratorIntegrationTests/BazelFakeWorkspace.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import Foundation
import XCTest
import TulsiGenerator
@testable import TulsiGenerator

class BazelFakeWorkspace {
let resourcesPathBase = "src/TulsiGeneratorIntegrationTests/Resources"
Expand Down
2 changes: 1 addition & 1 deletion src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class BazelIntegrationTestCase: XCTestCase {

// Explicitly set Xcode version to use. Must use the same version or the golden files
// won't match.
bazelBuildOptions.append("--xcode_version=13.2.1")
bazelBuildOptions.append("--xcode_version=13.4.1")

// Disable the Swift worker as it adds extra dependencies.
bazelBuildOptions.append("--define=RULES_SWIFT_BUILD_DUMMY_WORKER=1")
Expand Down
16 changes: 8 additions & 8 deletions ...neratorIntegrationTests/Resources/GoldenProjects/AppClipProject.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand All @@ -408,7 +408,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand Down Expand Up @@ -463,7 +463,7 @@
PRODUCT_NAME = AppClip;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand All @@ -480,7 +480,7 @@
PRODUCT_NAME = Application;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand Down Expand Up @@ -547,7 +547,7 @@
PRODUCT_NAME = AppClip;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand All @@ -564,7 +564,7 @@
PRODUCT_NAME = Application;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand Down Expand Up @@ -644,7 +644,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand All @@ -669,7 +669,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_app_clip;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand Down
24 changes: 12 additions & 12 deletions ...rIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_TEST_RUNNER_ONLY = YES;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand All @@ -949,7 +949,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand Down Expand Up @@ -1016,7 +1016,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand All @@ -1037,7 +1037,7 @@
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_TEST_RUNNER_ONLY = YES;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand All @@ -1054,7 +1054,7 @@
PRODUCT_NAME = Application;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand Down Expand Up @@ -1108,7 +1108,7 @@
PRODUCT_NAME = TodayExtension;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand Down Expand Up @@ -1220,7 +1220,7 @@
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_TEST_RUNNER_ONLY = YES;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand All @@ -1237,7 +1237,7 @@
PRODUCT_NAME = Application;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand Down Expand Up @@ -1291,7 +1291,7 @@
PRODUCT_NAME = TodayExtension;
SDKROOT = iphoneos;
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand Down Expand Up @@ -1410,7 +1410,7 @@
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_TEST_RUNNER_ONLY = YES;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand All @@ -1435,7 +1435,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand Down Expand Up @@ -1502,7 +1502,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_complex;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand Down
24 changes: 12 additions & 12 deletions ...GeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand All @@ -499,7 +499,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand All @@ -524,7 +524,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Release;
};
Expand Down Expand Up @@ -578,7 +578,7 @@
PRODUCT_NAME = MyCommandLineApp;
SDKROOT = macosx;
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand All @@ -595,7 +595,7 @@
PRODUCT_NAME = MyMacOSApp;
SDKROOT = macosx;
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand All @@ -612,7 +612,7 @@
PRODUCT_NAME = MyTodayExtension;
SDKROOT = macosx;
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Debug;
};
Expand Down Expand Up @@ -678,7 +678,7 @@
PRODUCT_NAME = MyCommandLineApp;
SDKROOT = macosx;
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand All @@ -695,7 +695,7 @@
PRODUCT_NAME = MyMacOSApp;
SDKROOT = macosx;
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand All @@ -712,7 +712,7 @@
PRODUCT_NAME = MyTodayExtension;
SDKROOT = macosx;
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = Release;
};
Expand Down Expand Up @@ -791,7 +791,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand All @@ -816,7 +816,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand All @@ -841,7 +841,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
TULSI_BUILD_PATH = tulsi_e2e_mac;
TULSI_XCODE_VERSION = 13.2.1.13C100;
TULSI_XCODE_VERSION = 13.4.1.13F100;
};
name = __TulsiTestRunner_Debug;
};
Expand Down
Loading

1 comment on commit d8c299b

@thii
Copy link
Member

@thii thii commented on d8c299b Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#369

Please sign in to comment.