@rnx-kit/cli 0.16.8 → 0.16.9

package/coverage/lcov-report/src/copy-assets.ts.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.3% </span>
+                <span class="strong">52.77% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>82/151</span>
+                <span class='fraction'>76/144</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">48.51% </span>
+                <span class="strong">47.47% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>49/101</span>
+                <span class='fraction'>47/99</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">76.47% </span>
+                <span class="strong">73.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>13/17</span>
+                <span class='fraction'>11/15</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54% </span>
+                <span class="strong">52.44% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>81/150</span>
+                <span class='fraction'>75/143</span>
             </div>
         
             
@@ -609,24 +609,8 @@
 <a name='L544'></a><a href='#L544'>544</a>
 <a name='L545'></a><a href='#L545'>545</a>
 <a name='L546'></a><a href='#L546'>546</a>
-<a name='L547'></a><a href='#L547'>547</a>
-<a name='L548'></a><a href='#L548'>548</a>
-<a name='L549'></a><a href='#L549'>549</a>
-<a name='L550'></a><a href='#L550'>550</a>
-<a name='L551'></a><a href='#L551'>551</a>
-<a name='L552'></a><a href='#L552'>552</a>
-<a name='L553'></a><a href='#L553'>553</a>
-<a name='L554'></a><a href='#L554'>554</a>
-<a name='L555'></a><a href='#L555'>555</a>
-<a name='L556'></a><a href='#L556'>556</a>
-<a name='L557'></a><a href='#L557'>557</a>
-<a name='L558'></a><a href='#L558'>558</a>
-<a name='L559'></a><a href='#L559'>559</a>
-<a name='L560'></a><a href='#L560'>560</a>
-<a name='L561'></a><a href='#L561'>561</a>
-<a name='L562'></a><a href='#L562'>562</a>
-<a name='L563'></a><a href='#L563'>563</a>
-<a name='L564'></a><a href='#L564'>564</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L547'></a><a href='#L547'>547</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -695,6 +679,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -895,6 +880,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -932,6 +919,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
@@ -958,33 +947,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1106,9 +1075,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1217,6 +1183,7 @@ export type AndroidArchive = {
       minSdkVersion?: number;
       targetSdkVersion?: number;
     };
+    kotlinVersion?: string;
   };
 };
 &nbsp;
@@ -1249,12 +1216,13 @@ export type AssetsConfig = {
 };
 &nbsp;
 const defaultAndroidConfig: Required&lt;Required&lt;AndroidArchive&gt;["android"]&gt; = {
-  androidPluginVersion: "7.1.3",
-  compileSdkVersion: 31,
+  androidPluginVersion: "7.2.2",
+  compileSdkVersion: 33,
   defaultConfig: {
     minSdkVersion: 23,
     targetSdkVersion: 29,
   },
+  kotlinVersion: "1.7.22",
 };
 &nbsp;
 function <span class="fstat-no" title="function not covered" >ensureOption(</span>options: Options, opt: string, flag = <span class="branch-0 cbranch-no" title="branch not covered" >opt)</span> {
@@ -1378,7 +1346,7 @@ export async function assembleAarBundle(
   }
 &nbsp;
   const findUp = require("find-up");
-  const gradlew = await findUp(
+  const gradlew = findUp.sync(
     os.platform() === "win32" ? <span class="branch-0 cbranch-no" title="branch not covered" >"gradlew.bat" </span>: "gradlew"
   );
   if (!gradlew) {
@@ -1405,7 +1373,7 @@ export async function assembleAarBundle(
   };
 &nbsp;
   const outputDir = path.join(context.options.assetsDest, "aar");
-  await fs.ensureDir(outputDir);
+  fs.ensureDirSync(outputDir);
 &nbsp;
   const dest = path.join(outputDir, `${targetName}-${version}.aar`);
 &nbsp;
@@ -1458,6 +1426,8 @@ export async function assembleAarBundle(
     const androidPluginVersion =
       android?.androidPluginVersion ??
       defaultAndroidConfig.androidPluginVersion;
+    const kotlinVersion =
+      android?.kotlinVersion ?? defaultAndroidConfig.kotlinVersion;
     const buildRelativeReactNativePath = path.relative(
       buildDir,
       reactNativePath
@@ -1470,6 +1440,7 @@ export async function assembleAarBundle(
       `      minSdkVersion = ${minSdkVersion}`,
       `      targetSdkVersion = ${targetSdkVersion}`,
       `      androidPluginVersion = "${androidPluginVersion}"`,
+      `      kotlinVersion = "${kotlinVersion}"`,
       "  }",
       "",
       "  repositories {",
@@ -1479,6 +1450,7 @@ export async function assembleAarBundle(
       "",
       "  dependencies {",
       '      classpath("com.android.tools.build:gradle:${project.ext.androidPluginVersion}")',
+      '      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")',
       "  }",
       "}",
       "",
@@ -1505,13 +1477,13 @@ export async function assembleAarBundle(
       "",
     ].join("\n");
 &nbsp;
-    await fs.ensureDir(buildDir);
-    await fs.writeFile(path.join(buildDir, "build.gradle"), buildGradle);
-    await fs.writeFile(
+    fs.ensureDirSync(buildDir);
+    fs.writeFileSync(path.join(buildDir, "build.gradle"), buildGradle);
+    fs.writeFileSync(
       path.join(buildDir, "gradle.properties"),
       gradleProperties
     );
-    await fs.writeFile(path.join(buildDir, "settings.gradle"), settingsGradle);
+    fs.writeFileSync(path.join(buildDir, "settings.gradle"), settingsGradle);
 &nbsp;
     // Run only one Gradle task at a time
     run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
@@ -1520,35 +1492,15 @@ export async function assembleAarBundle(
   await Promise.all(targetsToCopy.map(([src, dest]) =&gt; fs.copy(src, dest)));
 }
 &nbsp;
-async function copyFiles(files: unknown, destination: string): Promise&lt;void&gt; {
+function copyFiles(files: unknown, destination: string): Promise&lt;void&gt;[] {
   if (!Array.isArray(files) || files.length === 0) {
-    return;
+    return [];
   }
 &nbsp;
-  await fs.ensureDir(destination);
-  await Promise.all(
-    files.map((file) =&gt; {
-      const basename = path.basename(file);
-      return fs.copy(file, `${destination}/${basename}`);
-    })
-  );
-}
-&nbsp;
-async function copyXcodeAssets(
-  xcassets: unknown,
-  destination: string
-): Promise&lt;void&gt; {
-  if (!Array.isArray(xcassets) || xcassets.length === 0) {
-    return;
-  }
-&nbsp;
-  await fs.ensureDir(destination);
-  await Promise.all(
-    xcassets.map((catalog) =&gt; {
-      const dest = `${destination}/${path.basename(catalog)}`;
-      return fs.copy(catalog, dest);
-    })
-  );
+  fs.ensureDirSync(destination);
+  return files.map((file) =&gt; {
+    return fs.copy(file, `${destination}/${path.basename(file)}`);
+  });
 }
 &nbsp;
 export async function copyAssets(
@@ -1557,12 +1509,12 @@ export async function copyAssets(
   { assets, strings, xcassets }: NativeAssets
 ): Promise&lt;void&gt; {
   const tasks = [
-    copyFiles(assets, `${assetsDest}/assets/${packageName}`),
-    copyFiles(strings, `${assetsDest}/strings/${packageName}`),
+    ...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
+    ...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
   ];
 &nbsp;
   if (typeof xcassetsDest === "string") {
-    tasks.push(copyXcodeAssets(xcassets, xcassetsDest));
+    tasks.push(...copyFiles(xcassets, xcassetsDest));
   }
 &nbsp;
   await Promise.all(tasks);
@@ -1668,10 +1620,7 @@ export async function gatherConfigs({
  */
 export async function <span class="fstat-no" title="function not covered" >copyProjectAssets(</span>options: Options): Promise&lt;void&gt; {
   const projectRoot = <span class="cstat-no" title="statement not covered" >findPackageDir() || process.cwd();</span>
-  const content = <span class="cstat-no" title="statement not covered" >await fs.readFile(`${projectRoot}/package.json`, {</span>
-    encoding: "utf-8",
-  });
-  const manifest: PackageManifest = <span class="cstat-no" title="statement not covered" >JSON.parse(content);</span>
+  const manifest = <span class="cstat-no" title="statement not covered" >readPackage(projectRoot);</span>
   const context = <span class="cstat-no" title="statement not covered" >{ projectRoot, manifest, options };</span>
   const assetConfigs = <span class="cstat-no" title="statement not covered" >await gatherConfigs(context);</span>
 <span class="cstat-no" title="statement not covered" >  if (!assetConfigs) {</span>
@@ -1759,7 +1708,7 @@ export const rnxCopyAssetsCommand = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 21 2023 12:00:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.33% </span>
+                <span class="strong">53.3% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>119/219</span>
+                <span class='fraction'>113/212</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">48.95% </span>
+                <span class="strong">48.22% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>70/143</span>
+                <span class='fraction'>68/141</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">73.91% </span>
+                <span class="strong">71.42% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>17/23</span>
+                <span class='fraction'>15/21</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.12% </span>
+                <span class="strong">53.08% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>118/218</span>
+                <span class='fraction'>112/211</span>
             </div>
         
             
@@ -80,17 +80,17 @@
 </thead>
 <tbody><tr>
 	<td class="file medium" data-value="copy-assets.ts"><a href="copy-assets.ts.html">copy-assets.ts</a></td>
-	<td data-value="54.3" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 54%"></div><div class="cover-empty" style="width: 46%"></div></div>
+	<td data-value="52.77" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 52%"></div><div class="cover-empty" style="width: 48%"></div></div>
 	</td>
-	<td data-value="54.3" class="pct medium">54.3%</td>
-	<td data-value="151" class="abs medium">82/151</td>
-	<td data-value="48.51" class="pct low">48.51%</td>
-	<td data-value="101" class="abs low">49/101</td>
-	<td data-value="76.47" class="pct medium">76.47%</td>
-	<td data-value="17" class="abs medium">13/17</td>
-	<td data-value="54" class="pct medium">54%</td>
-	<td data-value="150" class="abs medium">81/150</td>
+	<td data-value="52.77" class="pct medium">52.77%</td>
+	<td data-value="144" class="abs medium">76/144</td>
+	<td data-value="47.47" class="pct low">47.47%</td>
+	<td data-value="99" class="abs low">47/99</td>
+	<td data-value="73.33" class="pct medium">73.33%</td>
+	<td data-value="15" class="abs medium">11/15</td>
+	<td data-value="52.44" class="pct medium">52.44%</td>
+	<td data-value="143" class="abs medium">75/143</td>
 	</tr>
 
 <tr>
@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 21 2023 12:00:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/metro-config.ts.html

@@ -694,7 +694,7 @@ export function customizeMetroConfig(
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 21 2023 12:00:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>