Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ disabled_rules:
- opening_brace # Conflicts with SwiftFormat
- trailing_comma
excluded:
- example/*/DerivedData/
- example/*/Pods/
- example/*/build/
- example/node_modules/
- node_modules/
2 changes: 1 addition & 1 deletion android/gradle-wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const INT_MAX = 2 ** 31 - 1;
* @type {[number, [number, string], [number, string]][]}
*/
const GRADLE_VERSIONS = [
[v(0, 80, 0), [v(8, 14, 1), "8.14.1"], [INT_MAX, ""]], // 0.80: [8.14.1, *)
[v(0, 80, 0), [v(8, 14, 3), "8.14.3"], [INT_MAX, ""]], // 0.80: [8.14.3, *)
[v(0, 79, 0), [v(8, 13, 0), "8.13"], [INT_MAX, ""]], // 0.79: [8.13, *)
[v(0, 78, 0), [v(8, 12, 0), "8.12"], [INT_MAX, ""]], // 0.78: [8.12, *)
[v(0, 76, 0), [v(8, 11, 1), "8.11.1"], [INT_MAX, ""]], // 0.76: [8.11.1, *)
Expand Down
18 changes: 9 additions & 9 deletions ios/ReactTestApp/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ final class ContentViewController: UITableViewController {
private let reactInstance: ReactInstance
private var sections: [SectionData]

public init(reactInstance: ReactInstance) {
init(reactInstance: ReactInstance) {
self.reactInstance = reactInstance
sections = []

Expand All @@ -53,7 +53,7 @@ final class ContentViewController: UITableViewController {

// MARK: - UIResponder overrides

override public func motionEnded(_: UIEvent.EventSubtype, with event: UIEvent?) {
override func motionEnded(_: UIEvent.EventSubtype, with event: UIEvent?) {
guard event?.subtype == .motionShake, let host = reactInstance.host else {
return
}
Expand All @@ -73,7 +73,7 @@ final class ContentViewController: UITableViewController {

// MARK: - UIViewController overrides

override public func viewDidLoad() {
override func viewDidLoad() {
super.viewDidLoad()

let manifest = Manifest.load()
Expand Down Expand Up @@ -154,21 +154,21 @@ final class ContentViewController: UITableViewController {

// MARK: - UITableViewDelegate overrides

override public func tableView(_: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
override func tableView(_: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
indexPath.section == Section.components
}

override public func tableView(_: UITableView, didSelectRowAt indexPath: IndexPath) {
override func tableView(_: UITableView, didSelectRowAt indexPath: IndexPath) {
sections[indexPath.section].items[indexPath.row].action?()
}

// MARK: - UITableViewDataSource overrides

override public func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int {
override func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int {
sections[section].items.count
}

override public func tableView(_: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
override func tableView(_: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let link = sections[indexPath.section].items[indexPath.row]
let cell = UITableViewCell(style: .default, reuseIdentifier: "cell")

Expand All @@ -193,11 +193,11 @@ final class ContentViewController: UITableViewController {
return cell
}

override public func numberOfSections(in _: UITableView) -> Int {
override func numberOfSections(in _: UITableView) -> Int {
sections.count
}

override public func tableView(_: UITableView, titleForFooterInSection section: Int) -> String? {
override func tableView(_: UITableView, titleForFooterInSection section: Int) -> String? {
sections[section].footer
}

Expand Down
2 changes: 1 addition & 1 deletion ios/ReactTestApp/ReactInstance.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ReactNativeHost
import ReactTestApp_DevSupport

final class ReactInstance: NSObject, RNXHostConfig {
public static let scanForQRCodeNotification =
static let scanForQRCodeNotification =
NSNotification.Name("ReactInstance.scanForQRCodeNotification")

static func jsBundleURL() -> URL? {
Expand Down
4 changes: 2 additions & 2 deletions test/android/gradle-wrapper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ describe("configureGradleWrapper()", () => {
process.argv.push("run-android");

const cases = [
["8.14", "0.80.0", "gradle-8.14.1-bin.zip"],
["8.14", "0.80.0", "gradle-8.14.3-bin.zip"],
["8.12", "0.79.0", "gradle-8.13-bin.zip"],
["8.11.1", "0.78.0", "gradle-8.12-bin.zip"],
["8.9", "0.76.0", "gradle-8.11.1-bin.zip"],
Expand Down Expand Up @@ -193,7 +193,7 @@ describe("configureGradleWrapper()", () => {
process.argv.push("run-android");

const cases = [
["8.14.1", "0.80.0"],
["8.14.3", "0.80.0"],
["8.13", "0.79.0"],
["8.12", "0.78.0"],
["8.11.1", "0.76.0"],
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.cjs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@rnx-kit/tsconfig/tsconfig.json",
"extends": "@rnx-kit/tsconfig/tsconfig.node.json",
"compilerOptions": {
"noEmit": true
},
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@rnx-kit/tsconfig/tsconfig.esm.json",
"extends": "@rnx-kit/tsconfig/tsconfig.esm.node.json",
"compilerOptions": {
"target": "ES2022",
"module": "ES2022",
Expand Down
20 changes: 12 additions & 8 deletions windows/app.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,18 @@ export async function generateSolution(destPath, options, fs = nodefs) {
const { msbuildprops, useHermes } = options;
const { useExperimentalNuGet, useFabric, versionNumber } = info;
const url = new URL(experimentalFeaturesPropsFilename, import.meta.url);
copyAndReplaceAsync(fileURLToPath(url), experimentalFeaturesPropsPath, {
"<RnwNewArch>false</RnwNewArch>": `<RnwNewArch>${useFabric}</RnwNewArch>`,
"<UseFabric>false</UseFabric>": `<UseFabric>${useFabric}</UseFabric>`,
"<UseHermes>true</UseHermes>": `<UseHermes>${useHermes == null ? versionNumber >= v(0, 73, 0) : useHermes}</UseHermes>`,
"<UseWinUI3>false</UseWinUI3>": `<UseWinUI3>${useFabric}</UseWinUI3>`,
"<UseExperimentalNuget>false</UseExperimentalNuget>": `<UseExperimentalNuget>${useExperimentalNuGet}</UseExperimentalNuget>`,
"<!-- AdditionalMSBuildProperties -->": msbuildprops ?? "",
});
await copyAndReplaceAsync(
fileURLToPath(url),
experimentalFeaturesPropsPath,
{
"<RnwNewArch>false</RnwNewArch>": `<RnwNewArch>${useFabric}</RnwNewArch>`,
"<UseFabric>false</UseFabric>": `<UseFabric>${useFabric}</UseFabric>`,
"<UseHermes>true</UseHermes>": `<UseHermes>${useHermes == null ? versionNumber >= v(0, 73, 0) : useHermes}</UseHermes>`,
"<UseWinUI3>false</UseWinUI3>": `<UseWinUI3>${useFabric}</UseWinUI3>`,
"<UseExperimentalNuget>false</UseExperimentalNuget>": `<UseExperimentalNuget>${useExperimentalNuGet}</UseExperimentalNuget>`,
"<!-- AdditionalMSBuildProperties -->": msbuildprops ?? "",
}
);
}

if (info.useExperimentalNuGet) {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3960,9 +3960,9 @@ __metadata:
linkType: hard

"@rnx-kit/tsconfig@npm:^2.0.0":
version: 2.0.1
resolution: "@rnx-kit/tsconfig@npm:2.0.1"
checksum: 10c0/28acc7c2d82be18dd3ec360222ece40981c137b6532df39ffbfdc7996af9818e6abf2a1f583923be07faf06ce8bf3a0b95c3d41680d67b05459a0d7ad4ed4235
version: 2.1.1
resolution: "@rnx-kit/tsconfig@npm:2.1.1"
checksum: 10c0/53aed185abd644250d95c732e44ecb66bcdf3005cc6eb854ba217346fa29cf0ea892bbd391e15050a5b553fe7dc983130add30c9aa30b1f66a0ca498d3409d94
languageName: node
linkType: hard

Expand Down
Loading