Skip to content

Commit e2e6ef4

Browse files
committed
refactor: Rename to avoid module name conflict
Address iOS build failures.
1 parent d8e2b30 commit e2e6ef4

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,5 +200,5 @@ src/translations/
200200
.claude/settings.local.json
201201

202202
# Auto-generated version files (regenerated by npm postinstall)
203-
ios/Sources/GutenbergKit/Sources/GutenbergKit.swift
204-
android/Gutenberg/src/main/java/org/wordpress/gutenberg/GutenbergKit.kt
203+
ios/Sources/GutenbergKit/Sources/GutenbergKitVersion.swift
204+
android/Gutenberg/src/main/java/org/wordpress/gutenberg/GutenbergKitVersion.kt

android/Gutenberg/src/main/java/org/wordpress/gutenberg/EditorAssetsLibrary.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class EditorAssetsLibrary(
4545
connection.requestMethod = "GET"
4646

4747
val defaultUserAgent = System.getProperty("http.agent") ?: ""
48-
connection.setRequestProperty("User-Agent", "$defaultUserAgent GutenbergKit/${GutenbergKit.VERSION}")
48+
connection.setRequestProperty("User-Agent", "$defaultUserAgent GutenbergKit/${GutenbergKitVersion.VERSION}")
4949

5050
// Set headers from configuration
5151
if (configuration.authHeader.isNotEmpty()) {
@@ -107,7 +107,7 @@ class EditorAssetsLibrary(
107107
connection.requestMethod = "GET"
108108

109109
val defaultUserAgent = System.getProperty("http.agent") ?: ""
110-
connection.setRequestProperty("User-Agent", "$defaultUserAgent GutenbergKit/${GutenbergKit.VERSION}")
110+
connection.setRequestProperty("User-Agent", "$defaultUserAgent GutenbergKit/${GutenbergKitVersion.VERSION}")
111111

112112
connection.connectTimeout = 30000
113113
connection.readTimeout = 30000

android/Gutenberg/src/main/java/org/wordpress/gutenberg/GutenbergView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class GutenbergView : WebView {
128128

129129
// Set custom user agent
130130
val defaultUserAgent = this.settings.userAgentString
131-
this.settings.userAgentString = "$defaultUserAgent GutenbergKit/${GutenbergKit.VERSION}"
131+
this.settings.userAgentString = "$defaultUserAgent GutenbergKit/${GutenbergKitVersion.VERSION}"
132132

133133
this.addJavascriptInterface(this, "editorDelegate")
134134
this.visibility = View.GONE

android/Gutenberg/src/test/java/org/wordpress/gutenberg/GutenbergViewTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,6 @@ class GutenbergViewTest {
161161
assertTrue("User agent should contain GutenbergKit identifier",
162162
userAgent.contains("GutenbergKit/"))
163163
assertTrue("User agent should contain version number",
164-
userAgent.contains("GutenbergKit/${GutenbergKit.VERSION}"))
164+
userAgent.contains("GutenbergKit/${GutenbergKitVersion.VERSION}"))
165165
}
166166
}

bin/generate-version.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ info( `Generating version files for version ${ version }` );
3333
const iosVersionContent = `// This file is auto-generated by bin/generate-version.js
3434
// Do not edit manually - changes will be overwritten
3535
36-
/// GutenbergKit library constants and utilities.
37-
public enum GutenbergKit {
36+
/// GutenbergKit version information.
37+
public enum GutenbergKitVersion {
3838
/// The current version of GutenbergKit.
3939
public static let version = "${ version }"
4040
}
4141
`;
4242

4343
const iosVersionPath = join(
4444
rootDir,
45-
'ios/Sources/GutenbergKit/Sources/GutenbergKit.swift'
45+
'ios/Sources/GutenbergKit/Sources/GutenbergKitVersion.swift'
4646
);
4747
writeFileSync( iosVersionPath, iosVersionContent, 'utf8' );
4848
info( `Generated ${ iosVersionPath }` );
@@ -54,9 +54,9 @@ const androidVersionContent = `// This file is auto-generated by bin/generate-ve
5454
package org.wordpress.gutenberg
5555
5656
/**
57-
* GutenbergKit library constants and utilities.
57+
* GutenbergKit version information.
5858
*/
59-
object GutenbergKit {
59+
object GutenbergKitVersion {
6060
/**
6161
* The current version of GutenbergKit.
6262
*/
@@ -66,7 +66,7 @@ object GutenbergKit {
6666

6767
const androidVersionPath = join(
6868
rootDir,
69-
'android/Gutenberg/src/main/java/org/wordpress/gutenberg/GutenbergKit.kt'
69+
'android/Gutenberg/src/main/java/org/wordpress/gutenberg/GutenbergKitVersion.kt'
7070
);
7171
writeFileSync( androidVersionPath, androidVersionContent, 'utf8' );
7272
info( `Generated ${ androidVersionPath }` );

ios/Sources/GutenbergKit/Sources/EditorHTTPClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public actor EditorHTTPClient: EditorHTTPClientProtocol {
111111
private func configureRequest(_ request: URLRequest) -> URLRequest {
112112
var mutableRequest = request
113113
mutableRequest.addValue(self.authHeader, forHTTPHeaderField: "Authorization")
114-
mutableRequest.addValue("\(Self.baseUserAgent) GutenbergKit/\(GutenbergKit.version)", forHTTPHeaderField: "User-Agent")
114+
mutableRequest.addValue("\(Self.baseUserAgent) GutenbergKit/\(GutenbergKitVersion.version)", forHTTPHeaderField: "User-Agent")
115115

116116
if let requestTimeout {
117117
mutableRequest.timeoutInterval = requestTimeout

ios/Sources/GutenbergKit/Sources/EditorViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
177177

178178
self.webView = GBWebView(frame: .zero, configuration: config)
179179
self.webView.scrollView.keyboardDismissMode = .interactive
180-
self.webView.configuration.applicationNameForUserAgent = "GutenbergKit/\(GutenbergKit.version)"
180+
self.webView.configuration.applicationNameForUserAgent = "GutenbergKit/\(GutenbergKitVersion.version)"
181181

182182
self.isWarmupMode = isWarmupMode
183183

ios/Sources/GutenbergKit/Sources/Views/HTMLPreview/HTMLWebViewRenderer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ final class HTMLWebViewRenderer {
9494
// Create web view with small initial frame for off-screen rendering
9595
// Frame will be adjusted per render based on viewport width and content height
9696
webView = WKWebView(frame: CGRect(x: 0, y: 0, width: 1200, height: 100), configuration: config)
97-
webView.configuration.applicationNameForUserAgent = "GutenbergKit/\(GutenbergKit.version)"
97+
webView.configuration.applicationNameForUserAgent = "GutenbergKit/\(GutenbergKitVersion.version)"
9898

9999
delegate = RenderDelegate()
100100
webView.navigationDelegate = delegate

ios/Tests/GutenbergKitTests/EditorHTTPClientTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ struct EditorHTTPClientTests {
352352
let capturedRequest = try #require(spySession.lastCapturedRequest)
353353
let userAgent = try #require(capturedRequest.value(forHTTPHeaderField: "User-Agent"))
354354
#expect(userAgent.contains("GutenbergKit/"))
355-
#expect(userAgent.contains(GutenbergKit.version))
355+
#expect(userAgent.contains(GutenbergKitVersion.version))
356356
}
357357

358358
@Test("download() sets User-Agent header with GutenbergKit identifier")
@@ -369,7 +369,7 @@ struct EditorHTTPClientTests {
369369
let capturedRequest = try #require(spySession.lastCapturedRequest)
370370
let userAgent = try #require(capturedRequest.value(forHTTPHeaderField: "User-Agent"))
371371
#expect(userAgent.contains("GutenbergKit/"))
372-
#expect(userAgent.contains(GutenbergKit.version))
372+
#expect(userAgent.contains(GutenbergKitVersion.version))
373373
}
374374

375375
@Test("User-Agent header includes platform identifier")

ios/Tests/GutenbergKitTests/GBWebViewTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ struct GBWebViewTests {
99
let result = try await GBWebView().evaluateJavaScript("navigator.userAgent")
1010
let string = try #require(result as? String)
1111

12-
#expect(string.hasSuffix("GutenbergKit/\(GutenbergKit.version)"))
12+
#expect(string.hasSuffix("GutenbergKit/\(GutenbergKitVersion.version)"))
1313
}
1414

1515
func testVersionConstantExists() {
16-
#expect(!GutenbergKit.version.isEmpty, "Version constant should not be empty")
17-
#expect(GutenbergKit.version.contains("."), "Version should be in semantic versioning format")
16+
#expect(!GutenbergKitVersion.version.isEmpty, "Version constant should not be empty")
17+
#expect(GutenbergKitVersion.version.contains("."), "Version should be in semantic versioning format")
1818
}
1919
}

0 commit comments

Comments
 (0)