feat: add prefab support

.github/workflows/build_and_test.yml

@@ -9,6 +9,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SIGNING_KEY }}
+      ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGNING_PASSWORD }}
 
     steps:
     - uses: actions/checkout@v4

.gitignore

@@ -20,6 +20,7 @@ package-lock.json
 bin/
 gen/
 out/
+.cxx/
 
 # Gradle files
 .gradle/

lib/cppruntime/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'maven-publish'
 
 def distDir = project.findProperty("distDir") ?: ""
 def jniLibsDir = project.findProperty("jniLibsDir") ?: ""
-def revision = project.findProperty("revision") ?: "".replaceAll("\\s", "")
+def version = project.findProperty("version") ?: "".replaceAll("\\s", "")
 
 if (!distDir) throw new RuntimeException("expecting --project-prop distDir=??? but was empty")
 if (!jniLibsDir) throw new RuntimeException("expecting --project-prop jniLibsDir=??? but was empty")
-if (!revision) throw new RuntimeException("expecting --project-prop revision=??? but was empty")
+if (!version) throw new RuntimeException("expecting --project-prop version=??? but was empty")
 
 android {
-  namespace 'org.webkit.androidjsc_cppruntime'
+  namespace 'io.github.react_native_community.jscandroid_cppruntime'
   compileSdkVersion 35
 
   defaultConfig {
@@ -34,17 +34,17 @@ android {
 
 dependencies {}
 
-project.group = "org.webkit"
-project.version = "r${revision}"
+project.group = "io.github.react-native-community"
+project.version = "${version}"
 
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
         pom {
-          name = "android-jsc"
-          artifactId = "android-jsc-cppruntime"
+          name = "jsc-android"
+          artifactId = "jsc-android-cppruntime"
           packaging = "aar"
         }
       }

lib/jsc-android/CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+project(jsc-android)
+
+add_library(jsclib SHARED IMPORTED GLOBAL)
+
+set_target_properties(jsclib
+  PROPERTIES
+  IMPORTED_LOCATION
+  "${PREBUILT_LIBS_DIR}/${ANDROID_ABI}/libjsc.so")
+
+add_library(jsc SHARED empty.cpp)

lib/jsc-android/build.gradle

@@ -0,0 +1,124 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+def distDir = project.findProperty("distDir") ?: ""
+def jniLibsDir = project.findProperty("jniLibsDir") ?: ""
+def headersDir = project.findProperty("headersDir") ?: "${distDir}/include"
+def version = project.findProperty("version") ?: "".replaceAll("\\s", "")
+def i18n = project.findProperty("i18n") ?: ""
+
+def signingKey = project.findProperty('signingKey')
+def signingPassword = project.findProperty('signingPassword')
+
+if (!distDir) throw new RuntimeException("expecting --project-prop distDir=??? but was empty")
+if (!jniLibsDir) throw new RuntimeException("expecting --project-prop jniLibsDir=??? but was empty")
+if (!version) throw new RuntimeException("expecting --project-prop version=??? but was empty")
+if (!i18n) throw new RuntimeException("expecting --project-prop i18n=??? but was empty")
+
+android {
+  namespace 'io.github.react_native_community.jscandroid'
+  compileSdkVersion 35
+
+  defaultConfig {
+    minSdkVersion 24
+    targetSdkVersion 34
+    versionCode 1
+    versionName "1.0"
+
+    externalNativeBuild {
+      cmake {
+        arguments '-DANDROID_STL=c++_shared',
+                  "-DPREBUILT_LIBS_DIR=${jniLibsDir}"
+        targets   'jsc'
+      }
+    }
+  }
+
+  externalNativeBuild {
+    cmake {
+      path 'CMakeLists.txt'
+    }
+  }
+
+  packagingOptions {
+    doNotStrip '**/libjsc.so'
+    pickFirst '**/libjsc.so'
+
+    excludes += [
+      '**/libc++_shared.so',
+    ]
+  }
+
+  buildFeatures {
+    prefabPublishing true
+  }
+
+  prefab {
+    jsc {
+      headerOnly true
+      headers file(headersDir).absolutePath
+    }
+  }
+
+  publishing {
+    singleVariant("release") {
+    }
+  }
+}
+
+dependencies {}
+
+project.group = "io.github.react-native-community"
+def artifactName = Boolean.valueOf(i18n) ? "jsc-android-intl" : "jsc-android"
+project.version = "${version}"
+
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        pom {
+          name = artifactName
+          artifactId = artifactName
+          description = 'Pre-build version of JavaScriptCore to be used by React Native apps'
+          url = 'https://github.com/react-native-community/jsc-android-buildscripts'
+
+          developers {
+            developer {
+              id = 'react-native-community'
+              name = 'React Native Community'
+            }
+          }
+
+          licenses {
+            license {
+              name = 'BSD-2-Clause'
+              url = 'https://github.com/react-native-community/jsc-android-buildscripts/blob/main/LICENSE'
+              distribution = 'repo'
+            }
+          }
+
+          scm {
+            url = 'https://github.com/react-native-community/jsc-android-buildscripts.git'
+            connection = 'scm:git:https://github.com/react-native-community/jsc-android-buildscripts.git'
+            developerConnection = 'scm:git:[email protected]:react-native-community/jsc-android-buildscripts.git'
+          }
+        }
+      }
+    }
+
+    repositories {
+      maven {
+        url = "file://${distDir}"
+      }
+    }
+
+    if (signingKey && signingPassword) {
+      signing {
+        useInMemoryPgpKeys(signingKey, signingPassword)
+        sign publishing.publications.release
+      }
+    }
+  }
+}

lib/settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'JavaScriptCore Lib'
 
-include ':android-jsc'
+include ':jsc-android'
 include ':cppruntime'

measure/android/build.gradle

@@ -6,7 +6,7 @@ ext {
     JSC_VERSION = jscAAR ? file(file(jscAAR).getParent()).getName() : ""
 
     def i18nProp = project.findProperty("i18n")
-    JSC_NAME = Boolean.valueOf(i18nProp) ? "android-jsc-intl" : "android-jsc"
+    JSC_NAME = Boolean.valueOf(i18nProp) ? "jsc-android-intl" : "jsc-android"
 
     isIDE = System.getProperties()['idea.platform.prefix'] != null
 }
@@ -18,7 +18,7 @@ if (!isIDE && JSC_VERSION) {
         configurations.all {
             resolutionStrategy {
                 eachDependency { DependencyResolveDetails details ->
-                    if (details.requested.name == 'android-jsc') {
+                    if (details.requested.name == 'jsc-android') {
                         details.useTarget group: details.requested.group, name: JSC_NAME, version: JSC_VERSION
                     }
                 }
@@ -43,7 +43,7 @@ buildscript {
 
 allprojects {
     repositories {
-        // this tells gradle where android-jsc resides
+        // this tells gradle where jsc-android resides
         maven {
             url JSC_DIR
         }

scripts/start.sh

@@ -79,12 +79,14 @@ createAAR() {
   local distDir=$2
   local jniLibsDir=$3
   local i18n=$4
+  local headersDir=${distDir}/include
   printf "\n\n\t\t===================== create aar :${target}: =====================\n\n"
   cd $ROOTDIR/lib
   ./gradlew clean :${target}:publish \
       --project-prop distDir="${distDir}" \
       --project-prop jniLibsDir="${jniLibsDir}" \
-      --project-prop revision="$REVISION" \
+      --project-prop headersDir="${headersDir}" \
+      --project-prop version="${npm_package_version}" \
       --project-prop i18n="${i18n}"
   cd $ROOTDIR
 }
@@ -104,19 +106,19 @@ export I18N=true
 prep
 compile
 
-export DISTDIR=${ROOTDIR}/dist
 printf "\n\n\t\t===================== create stripped distributions =====================\n\n"
-createAAR "android-jsc" ${DISTDIR} ${INSTALL_DIR_I18N_false} "false"
-createAAR "android-jsc" ${DISTDIR} ${INSTALL_DIR_I18N_true} "true"
-createAAR "cppruntime" ${DISTDIR} ${INSTALL_CPPRUNTIME_DIR} "false"
+export DISTDIR=${ROOTDIR}/dist
 copyHeaders ${DISTDIR}
+createAAR "jsc-android" ${DISTDIR} ${INSTALL_DIR_I18N_false} "false"
+createAAR "jsc-android" ${DISTDIR} ${INSTALL_DIR_I18N_true} "true"
+createAAR "cppruntime" ${DISTDIR} ${INSTALL_CPPRUNTIME_DIR} "false"
 
 printf "\n\n\t\t===================== create unstripped distributions =====================\n\n"
 export DISTDIR=${ROOTDIR}/dist.unstripped
-createAAR "android-jsc" ${DISTDIR} ${INSTALL_UNSTRIPPED_DIR_I18N_false} "false"
-createAAR "android-jsc" ${DISTDIR} ${INSTALL_UNSTRIPPED_DIR_I18N_true} "true"
-createAAR "cppruntime" ${DISTDIR} ${INSTALL_CPPRUNTIME_DIR} "false"
 copyHeaders ${DISTDIR}
+createAAR "jsc-android" ${DISTDIR} ${INSTALL_UNSTRIPPED_DIR_I18N_false} "false"
+createAAR "jsc-android" ${DISTDIR} ${INSTALL_UNSTRIPPED_DIR_I18N_true} "true"
+createAAR "cppruntime" ${DISTDIR} ${INSTALL_CPPRUNTIME_DIR} "false"
 
 npm run info