Skip to content

Commit 0fe4b3a

Browse files
Drop outdated clang-format from npm (#5191)
* enable logs on expo sample * repro' * patch clang-format and run it * return flags * return original sample code * more rollback * print clang version * remove deprecated package, add clang-format setup * try setup clang21 * other strategy to update clang/ more changes for version * gh action name change * Update .github/workflows/buildandtest.yml
1 parent dbad33e commit 0fe4b3a

24 files changed

Lines changed: 130 additions & 133 deletions

.github/workflows/buildandtest.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,22 @@ jobs:
5151
cache-dependency-path: yarn.lock
5252
- name: Install Dependencies
5353
run: yarn install
54+
55+
# Default of ubuntu and apt packages are too old compared to macos packages.
56+
# This is required for using a newer version of clang-format.
57+
- name: Setup clang-format V20
58+
run: |
59+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 20
60+
sudo apt-get install -y clang-20 clang-format-20 lld-20 lldb-20
61+
62+
- name: Set clang-format V20 as default
63+
run: |
64+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 200
65+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 200
66+
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 200
67+
clang --version
68+
clang-format --version
69+
5470
- name: Lint
5571
run: yarn lint
5672

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@expo/swiftlint": "^0.57.1",
3232
"@naturalcycles/ktlint": "^1.13.0",
3333
"@sentry/cli": "2.53.0",
34-
"clang-format": "^1.8.0",
3534
"downlevel-dts": "^0.11.0",
3635
"google-java-format": "^1.4.0",
3736
"lerna": "^8.1.8",

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentry+Test.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#import <RNSentry/RNSentry.h>
22

3-
@interface
4-
RNSentry (RNSentryInternal)
3+
@interface RNSentry (RNSentryInternal)
54

65
+ (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
76
otherUserKeys:(NSDictionary *)userDataKeys;

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ - (void)testRNSentryDependencyContainerInitializesFrameTracker
2222
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
2323
.andReturn(frameTrackerMock);
2424

25-
RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {};
25+
RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) { };
2626
[[RNSentryDependencyContainer sharedInstance]
2727
initializeFramesTrackerListenerWith:emitNewFrameEvent];
2828
XCTAssertNotNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ - (void)testRNSentryFramesTrackerIsOneTimeListener
4646
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
4747
.andReturn(frameTrackerMock);
4848

49-
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
49+
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) { };
5050

5151
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
5252
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
@@ -66,7 +66,7 @@ - (void)testRNSentryFramesTrackerAddsItselfAsListener
6666
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
6767
.andReturn(frameTrackerMock);
6868

69-
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
69+
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) { };
7070

7171
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
7272
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporter+Test.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#import "RNSentryOnDrawReporter.h"
22
#import <Foundation/Foundation.h>
33

4-
@interface
5-
RNSentryOnDrawReporterView (Testing)
4+
@interface RNSentryOnDrawReporterView (Testing)
65

76
+ (instancetype)createWithMockedListener;
87
- (RNSentryEmitNewFrameEvent)createEmitNewFrameEvent;

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporter+Test.mm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ - (void)framesTrackerHasNewFrame:(nonnull NSDate *)newFrameDate
2828

2929
@end
3030

31-
@implementation
32-
RNSentryOnDrawReporterView (Testing)
31+
@implementation RNSentryOnDrawReporterView (Testing)
3332

3433
+ (instancetype)createWithMockedListener
3534
{

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
@class SentryOptions;
55

6-
@interface
7-
SentrySDKInternal (PrivateTests)
6+
@interface SentrySDKInternal (PrivateTests)
87

98
+ (nullable SentryOptions *)options;
109
@end

packages/core/ios/RNSentry+fetchNativeStack.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
// This method was moved to a new category so we can use `@import Sentry` to use Sentry's Swift
1818
// classes
19-
@implementation
20-
RNSentry (fetchNativeStack)
19+
@implementation RNSentry (fetchNativeStack)
2120

2221
- (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAddr
2322
symbolicate:(SymbolicateCallbackType)symbolicate

packages/core/ios/RNSentry.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ typedef int (*SymbolicateCallbackType)(const void *, Dl_info *);
2828

2929
@end
3030

31-
@interface
32-
RNSentry (fetchNativeStack)
31+
@interface RNSentry (fetchNativeStack)
3332

3433
- (NSDictionary *_Nonnull)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAddr
3534
symbolicate:(SymbolicateCallbackType)symbolicate;

0 commit comments

Comments
 (0)