Removed all mentions of GCDWebServer

realm · Jan 12, 2022 · 6a3ebd7 · 6a3ebd7
1 parent 91d7bd9
commit 6a3ebd7
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 257 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "vendor/GCDWebServer"]
-	path = vendor/GCDWebServer
-	url = https://github.com/swisspol/GCDWebServer.git
 [submodule "docs/jsdoc-template"]
 	path = docs/jsdoc-template
 	url = https://github.com/realm/realm-jsdoc.git

diff --git a/Realm.xcworkspace/xcshareddata/Realm.xcscmblueprint b/Realm.xcworkspace/xcshareddata/Realm.xcscmblueprint
@@ -11,7 +11,6 @@
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "5EE721F9-041C-4877-9E73-A925C9DB080A",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "40F53A12E4AE40C654358321B91166ABD3E910A6" : "realm-js\/",
-    "F6F96CA34C5878B0A9123C7C37855491A5E599DA" : "realm-js\/vendor\/GCDWebServer\/",
     "8F3C415DA79CDA7D23734F285B95F9F9A3C0CB81" : "realm-js\/src\/object-store\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Realm",
@@ -27,11 +26,6 @@
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/realm\/realm-object-store.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8F3C415DA79CDA7D23734F285B95F9F9A3C0CB81"
-    },
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/swisspol\/GCDWebServer.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F6F96CA34C5878B0A9123C7C37855491A5E599DA"
     }
   ]
 }
diff --git a/RealmJS.podspec b/RealmJS.podspec
@@ -67,6 +67,4 @@ Pod::Spec.new do |s|
   s.vendored_frameworks = 'react-native/ios/realm-js-ios.xcframework'
 
   s.dependency 'React'
-  # TODO: Ensure the same version of GCDWebServer is used for Android
-  # s.dependency 'GCDWebServer'
 end
diff --git a/packages/realm-react/example/ios/Podfile.lock b/packages/realm-react/example/ios/Podfile.lock
@@ -71,9 +71,6 @@ PODS:
     - FlipperKit/Core
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
-  - GCDWebServer (3.5.4):
-    - GCDWebServer/Core (= 3.5.4)
-  - GCDWebServer/Core (3.5.4)
   - glog (0.3.5)
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.180)
@@ -338,8 +335,7 @@ PODS:
     - React-cxxreact (= 0.65.1)
     - React-jsi (= 0.65.1)
     - React-perflogger (= 0.65.1)
-  - RealmJS (10.9.1):
-    - GCDWebServer
+  - RealmJS (10.20.0-beta.0):
     - React
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -414,7 +410,6 @@ SPEC REPOS:
     - Flipper-RSocket
     - FlipperKit
     - fmt
-    - GCDWebServer
     - libevent
     - OpenSSL-Universal
     - YogaKit
@@ -497,7 +492,6 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
   glog: 5337263514dd6f09803962437687240c5dc39aa4
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
@@ -525,7 +519,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 92d41c2442e5328cc4d342cd7f78e5876b68bae5
   React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de
   ReactCommon: eafed38eec7b591c31751bfa7494801618460459
-  RealmJS: db77f07dbb7bde3754ee19aa3ce16c050b972751
+  RealmJS: 6e47a0a9619d19dd238ef635abee5724cb677247
   Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

diff --git a/react-native/android/build.gradle b/react-native/android/build.gradle
@@ -21,25 +21,6 @@ allprojects {
 
 apply plugin: 'com.android.library'
 
-tasks.register('forwardDebugPort', Exec) {
-    def adb = android.getAdbExe()?.toString() ?: 'false'
-    commandLine adb, 'forward', 'tcp:8083', 'tcp:8083'
-    ignoreExitValue true
-    doLast {
-        if (execResult.getExitValue() != 0) {
-            logger.error(
-                '===========================================================================\n' +
-                'WARNING: Failed to automatically forward port 8083.\n' +
-                'In order to use Realm in Chrome debugging mode, port 8083 must be forwarded\n' +
-                'from localhost to the device or emulator being used to run the application.\n' +
-                'You may need to add the appropriate flags to the command that failed:\n' +
-                '    adb forward tcp:8083 tcp:8083\n' +
-                '===========================================================================\n'
-            )
-        }
-    }
-}
-
 android {
     compileSdkVersion rootProject.hasProperty("compileSdkVersion") ? rootProject.compileSdkVersion : 28
     buildToolsVersion rootProject.hasProperty("buildToolsVersion") ? rootProject.buildToolsVersion : "28.0.3"
@@ -53,10 +34,6 @@ android {
             jniDebuggable true
         }
     }
-
-    tasks.withType(JavaCompile) {
-        compileTask -> compileTask.dependsOn forwardDebugPort
-    }
 }
 
 String getAppId () {
@@ -96,6 +73,5 @@ try {
 
 project.dependencies {
     add(dependencyType, fileTree(dir: 'libs', include: ['*.jar']))
-    add(dependencyType, 'org.nanohttpd:nanohttpd:2.2.0')
     add(dependencyType, 'com.facebook.react:react-native:+')
 }