Merge branch 'dev-0.10'

Author: birdofpreyru

.circleci/config.yml

@@ -10,15 +10,14 @@ jobs:
       - checkout
       - run: git submodule update --init --recursive
       - restore_cache:
-          key: node-modules-{{ checksum "package-lock.json" }}-{{ checksum "example/package-lock.json" }}
-      - run: npm install
-      - run: npm run bootstrap
+          key: node-modules-{{ checksum "yarn.lock" }}
+      - run: yarn install
       - save_cache:
-          key: node-modules-{{ checksum "package-lock.json" }}-{{ checksum "example/package-lock.json" }}
+          key: node-modules-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
             - example/node_modules
-      - run: npm test
+      - run: yarn test
       - persist_to_workspace:
           root: .
           paths:

.gitignore

@@ -28,6 +28,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+**/.xcode.env.local
 
 # Android/IJ
 #
@@ -61,6 +62,14 @@ buck-out/
 android/app/libs
 android/keystores/debug.keystore
 
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # Expo
 .expo/
 
@@ -71,4 +80,4 @@ android/keystores/debug.keystore
 lib/
 
 # Other
-/dr.pogodin-react-native-static-server-*.tgz
+/package.tgz

.npmignore

@@ -1,7 +1,14 @@
-.*
+**/.*
+**/__fixtures__
+**/__mocks__
+**/__tests__
 android/build
+android/gradle
+android/gradlew
+android/gradlew.bat
+android/local.properties
 build
 dr.pogodin-react-native-static-server-*.tgz
 /example/
 ios/build
-node_modules
+node_modules

.nvmrc

@@ -1 +1 @@
-20.9.0
+v18

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

@@ -0,0 +1,10 @@
+nodeLinker: node-modules
+nmHoistingLimits: workspaces
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

@@ -1,6 +1,6 @@
 # MIT License
 
-_Copyright © 2022–2023, Dr. Sergey Pogodin_
+_Copyright © 2022–2024, Dr. Sergey Pogodin_
   &mdash; <[email protected]> (https://dr.pogodin.studio) \
 _Copyright &copy; 2017, futurepress_
 

.yarn/releases/yarn-3.6.1.cjs

@@ -1,11 +1,16 @@
 buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["ReactNativeStaticServer_kotlinVersion"]
+
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
     classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
@@ -14,9 +19,7 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: "com.android.library"
-
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
@@ -30,7 +33,26 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["ReactNativeStaticServer_" + name]).toInteger()
 }
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
 android {
+  if (supportsNamespace()) {
+    namespace "com.drpogodin.reactnativestaticserver"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
+    }
+  }
+
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
@@ -55,6 +77,10 @@ android {
     }
   }
 
+  buildFeatures {
+    buildConfig true
+  }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -91,12 +117,14 @@ repositories {
   google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 if (isNewArchitectureEnabled()) {