@ohos-ports/react-native-gradle-plugin 0.71.19-beta.0 → 0.71.19-beta.1

package/build.gradle.kts

@@ -5,10 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  kotlin("jvm") version "2.4.0"
+  kotlin("jvm") version "2.1.20"
   id("java-gradle-plugin")
 }
 
@@ -43,15 +44,13 @@ java {
   targetCompatibility = JavaVersion.VERSION_11
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-  compilerOptions {
-    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
-  }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion }
 }
 
 tasks.withType<Test>().configureEach {
   testLogging {
-    exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+    exceptionFormat = TestExceptionFormat.FULL
     showExceptions = true
     showCauses = true
     showStackTraces = true

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/gradlew

@@ -29,7 +29,7 @@
 #
 #           ksh Gradle
 #
-#       Busybox and similar reduced shells will NOT work, because this script
+#   Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
 #         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
@@ -86,7 +86,19 @@ APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# HarmonyOS toybox xargs does not strip quotes from DEFAULT_JVM_OPTS,
+# so we use unquoted space-separated values instead.
+# Also override os.name=Linux because Gradle/Kotlin plugin does not recognize HarmonyOS.
+DEFAULT_JVM_OPTS='-Xmx64m -Xms64m -Dos.name=Linux -Dos.arch=aarch64'
+
+# HarmonyOS compatibility: ensure the Gradle daemon also gets os.name=Linux
+# because Gradle/Kotlin do not recognize HarmonyOS as an operating system.
+# JAVA_TOOL_OPTIONS is used because it propagates to forked JVM processes
+# (like the Gradle daemon), unlike -D options in DEFAULT_JVM_OPTS which only
+# affect the wrapper process.
+if [ "$(uname -s)" = "HarmonyOS" ]; then
+    export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -Dos.name=Linux -Dos.arch=aarch64"
+fi
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -186,8 +198,8 @@ if "$cygwin" || "$msys" ; then
         # possibly modified.
         #
         # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
+        # changing the positional parameters here affects neither the number
+        # of iterations, nor the values presented in `arg`.
         shift                   # remove old arg
         set -- "$@" "$arg"      # push replacement arg
     done
@@ -205,30 +217,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# HarmonyOS fix: toybox xargs does not strip quotes from quoted arguments,
+# causing JVM options like "-Xmx64m" to be passed as literal strings with
+# quotes instead of being parsed as -Xmx64m. This results in:
+#   "Error: Could not find or load main class \"-Xmx64m\""
+# Instead of using xargs-based parsing, we use simple word splitting which
+# works correctly with unquoted DEFAULT_JVM_OPTS on all POSIX shells.
+eval "set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS \"\$@\""
 
 exec "$JAVACMD" "$@"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/react-native-gradle-plugin",
-  "version": "0.71.19-beta.0",
+  "version": "0.71.19-beta.1",
   "description": "⚛️ Gradle Plugin for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-gradle-plugin",
   "repository": {
@@ -13,7 +13,6 @@
     "clean": "./gradlew clean",
     "test": "./gradlew check"
   },
-  "main": "index.js",
   "license": "MIT",
   "files": [
     "settings.gradle.kts",
@@ -22,9 +21,8 @@
     "gradlew",
     "gradlew.bat",
     "src/main",
-    "README.md",
-    "index.js",
-    "build/libs/",
-    "build/libs/*.jar"
-  ]
+    "README.md"
+  ],
+  "dependencies": {},
+  "devDependencies": {}
 }

package/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt

@@ -13,6 +13,7 @@ import com.facebook.react.utils.moveTo
 import com.facebook.react.utils.windowsAwareCommandLine
 import java.io.File
 import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
 import org.gradle.api.file.ConfigurableFileTree
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
@@ -127,13 +128,15 @@ abstract class BundleHermesCTask : DefaultTask() {
       File(jsIntermediateSourceMapsDir.get().asFile, "$bundleAssetName.compiler.map")
 
   private fun runCommand(command: List<Any>) {
-    val process = ProcessBuilder(command.map { it.toString() })
-        .directory(root.get().asFile)
-        .redirectErrorStream(true)
-        .start()
+    val process =
+        ProcessBuilder(command.map { it.toString() })
+            .directory(root.get().asFile)
+            .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+            .redirectError(ProcessBuilder.Redirect.INHERIT)
+            .start()
     val exitCode = process.waitFor()
     if (exitCode != 0) {
-        throw org.gradle.api.GradleException("Command failed with exit code $exitCode: $command")
+      throw GradleException("Process '$command' finished with exit value $exitCode")
     }
   }
 

package/index.js

@@ -1,73 +0,0 @@
-/**
- * react-native-gradle-plugin Node.js entry point
- *
- * This package is a Gradle/Kotlin build plugin for React Native.
- * It is compiled to a JAR file and loaded via the JVM/Gradle runtime.
- * This JS entry point provides a bridge to invoke the Gradle plugin
- * from Node.js using the available JVM and Gradle toolchain.
- */
-
-const { execSync } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-
-// Locate the compiled JAR
-const jarPath = path.join(__dirname, 'build', 'libs', 'react-native-gradle-plugin.jar');
-
-// Package metadata
-const pkg = require('./package.json');
-
-/**
- * Get the path to the compiled Gradle plugin JAR.
- * @returns {string} Absolute path to the JAR file
- */
-function getJarPath() {
-  return jarPath;
-}
-
-/**
- * Check if the JAR has been compiled and is available.
- * @returns {boolean} True if the JAR exists
- */
-function isCompiled() {
-  return fs.existsSync(jarPath);
-}
-
-/**
- * Run the Gradle plugin via the Gradle build tool.
- * This invokes the Gradle build system with the React Native plugin applied.
- *
- * @param {Object} options - Options for the Gradle invocation
- * @param {string} options.projectDir - Directory of the project to build
- * @param {string[]} options.tasks - Gradle tasks to execute
- * @param {Object} options.gradleProps - Additional Gradle properties
- * @returns {string} Output of the Gradle command
- */
-function runGradle(options = {}) {
-  const projectDir = options.projectDir || process.cwd();
-  const tasks = options.tasks || ['assembleRelease'];
-  const gradleCmd = process.env.GRADLE_CMD || 'gradle';
-  const args = [gradleCmd, ...tasks, '-p', projectDir];
-
-  if (options.gradleProps) {
-    for (const [key, value] of Object.entries(options.gradleProps)) {
-      args.push(`-P${key}=${value}`);
-    }
-  }
-
-  const cmd = args.join(' ');
-  return execSync(cmd, {
-    cwd: projectDir,
-    encoding: 'utf-8',
-    stdio: 'pipe',
-  });
-}
-
-module.exports = {
-  name: pkg.name,
-  version: pkg.version,
-  description: pkg.description,
-  getJarPath,
-  isCompiled,
-  runGradle,
-};