Merge branch 'dev-0.9'

Author: birdofpreyru

.nvmrc

@@ -1 +1 @@
-18.18.0
+20.9.0

CMakeLists.txt

@@ -39,13 +39,17 @@ if(CMAKE_SYSTEM_NAME MATCHES "Android")
 # Mac Catalyst build is the only scenario we have where the target system name
 # is Darwin.
 elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  set(PCRE2_TARGET --target pcre2-8-static)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -target x86_64-apple-ios-macabi")
   set(
     EXTRA_BUILD_ARGS
     -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
     -DCMAKE_OSX_ARCHITECTURES=${ESCAPED_ARCHS}
   )
+  # This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
+  # we don't really use them anyway, but we need them build for the install
+  # command below to work.
+  set(EXTRA_INSTALL_ARGS "--;CODE_SIGNING_ALLOWED=NO")
+
 elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
   set(
     EXTRA_BUILD_ARGS
@@ -55,7 +59,10 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
     -DCMAKE_IOS_INSTALL_COMBINED=${CMAKE_IOS_INSTALL_COMBINED}
     -GXcode
   )
-  set(PCRE2_TARGET --target pcre2-8-static)
+  # This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
+  # we don't really use them anyway, but we need them build for the install
+  # command below to work.
+  set(EXTRA_INSTALL_ARGS "--;CODE_SIGNING_ALLOWED=NO")
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Android|Windows")
@@ -75,21 +82,10 @@ execute_process(
 
 execute_process(
   COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/pcre2
-    --config Release
-    ${PCRE2_TARGET}
+    --config Release ${EXTRA_INSTALL_ARGS}
 )
 
-if(
-  NOT CMAKE_SYSTEM_NAME MATCHES "iOS"
-
-  # TODO: We wanna say "and not Mac Catalyst build", for which the current
-  # condition is not specific enough, but will do for now, as Mac Catalyst
-  # build is the only scenario we gonna have Darwin as the target platform
-  # as of now.
-  AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"
-)
-  execute_process(COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR}/pcre2)
-endif()
+execute_process(COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR}/pcre2)
 
 # Copies shared PCRE2 library into the folder from where Gradle automatically
 # will bundle it in the host app package.
@@ -104,21 +100,18 @@ if(CMAKE_SYSTEM_NAME MATCHES "Android|Windows")
   set(BUILD_SHARED_LIBS 1)
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPCRE2_CODE_UNIT_WIDTH=8 -I${CMAKE_BINARY_DIR}/sysroot/include -L${CMAKE_BINARY_DIR}/sysroot/lib")
-
-# To find PCRE2 Lighttpd first of all tries to use pkg_check_modules().
-# It seems that on Linux it ends up relying on pkg-config utility of the host
-# system, which find the host's version of PCRE2. With CMake 3.18.1 it was fine,
-# as it used to output the linker flag for PCRE2 just as "-lpcre2-8",
-# and just above we set the correct -L flag with the path of PCRE2
-# cross-compiled for Android. However, with CMake 3.22.1 the CMake's default
-# output is "-L/usr/lib/x86_64-linux-gnu;-lpcre2-8", which ends up forcing
-# Lighttpd to try linking against the host's PCRE2, which fails. The flag set
-# below instructs pkg-config to not include -L flag into outputs,
-# thus restoring the correct linking. However, it is not the best fix,
-# I guess.
-# TODO: Find a better fix.
-set(PKG_CONFIG_ARGN --libs-only-l)
+# Above we have build & installed a local version of PCRE2 library, now we want
+# to enforce Lighttpd build to see and use it (rather than any system-wide
+# installation of another PCRE2 version). On Ubuntu / macOS it can be done
+# by setting CMAKE_PREFIX_PATH; somehow it has no effect in Msys2 / UCRT64
+# builds for Windows (beyond by current understanding), but there setting
+# the PKG_CONFIG_PATH environment variable, which is picked up by pkg-config
+# does the trick.
+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+  set(ENV{PKG_CONFIG_PATH} "${CMAKE_BINARY_DIR}/sysroot/lib/pkgconfig")
+else()
+  set(CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/sysroot")
+endif()
 
 add_subdirectory(lighttpd1.4)
 

README.md

@@ -6,7 +6,7 @@
 [![GitHub Repo stars](https://img.shields.io/github/stars/birdofpreyru/react-native-static-server?style=social)](https://github.com/birdofpreyru/react-native-static-server)
 [![Dr. Pogodin Studio](https://raw.githubusercontent.com/birdofpreyru/react-native-static-server/master/.README/logo-dr-pogodin-studio.svg)](https://dr.pogodin.studio/docs/react-native-static-server)
 
-Embed HTTP server for [React Native] applications for Android, iOS, Mac (Catalyst),
+Embedded HTTP server for [React Native] applications for Android, iOS, Mac (Catalyst),
 and Windows platforms. Powered by [Lighttpd] server, supports both [new][New Architecture]
 and [old][Old Architecture] RN architectures.
 
@@ -109,11 +109,21 @@ and [old][Old Architecture] RN architectures.
 - For **Android**:
   - In the `build.gradle` file set `minSdkVersion` equal `28`
     ([SDK 28 — Android 9](https://developer.android.com/studio/releases/platforms#9.0),
-    released in August 2018), or larger.
-
+    released in August 2018), or larger. \
     **Note:** _Support of older SDKs is technically possible, but it is not
     a priority now._
 
+  - Android SDK 28 and above
+    [forbids Cleartext / Plaintext HTTP](https://developer.android.com/privacy-and-security/risks/cleartext)
+    by default. Thus, to access locally running server over HTTP from within
+    your app, you should either allow all uses of HTTP in your app by adding
+    `android:usesCleartextTraffic="true"` attribute to `<application>` element
+    in the `AndroidManifest.xml`
+    ([see how it is done in the example app](https://github.com/birdofpreyru/react-native-static-server/blob/master/example/android/app/src/main/AndroidManifest.xml));
+    or alternatively you should use
+    [network security configuration](https://developer.android.com/privacy-and-security/security-config)
+    to permit cleartext HTTP for selected domains only.
+
 - For **iOS**:
   - After installing the package, enter `ios` folder of the app's codebase
     and execute

example/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.12'
+gem 'cocoapods', '~> 1.13'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'