expo-tiddlywiki-filesystem-android-external-storage 2.11.0 → 2.12.0

package/README.md

@@ -118,6 +118,16 @@ Deletes a directory recursively.
 ### `isExternalStorageManager(): Promise<boolean>`
 Checks if the `MANAGE_EXTERNAL_STORAGE` permission is granted (Android 11+).
 
+## JGit Version Note
+
+This module bundles **JGit 6.2.x** (not the latest 6.10.x) for Android compatibility.
+
+Newer JGit versions (6.3+) call Java 9+ APIs (`InputStream.readNBytes`, `InputStream.transferTo`) that are **not available on Android at any API level** — Android's `desugar_jdk_libs` only backfills Java 8 language APIs, not these Java 9 I/O methods. This has been confirmed on Android 12 (API 31) and is expected to affect all current Android versions.
+
+JGit 6.2.x is the latest release that avoids these Java 9+ API calls while still providing all the Git primitives needed by this module (clone, fetch, push, status, diff, log, etc.). One API trade-off: `CloneCommand.setDepth()` (shallow clone) was introduced in JGit 6.3, so this module does not support `--depth` on clone.
+
+If you need a newer JGit, ensure your app's `minSdkVersion` and desugaring configuration are verified on all target devices.
+
 ## License
 
 MIT

package/android/build.gradle

@@ -14,12 +14,14 @@ android {
   }
   // JGit needs Java 11+
   compileOptions {
+    coreLibraryDesugaringEnabled true
     sourceCompatibility JavaVersion.VERSION_11
     targetCompatibility JavaVersion.VERSION_11
   }
 }
 
 dependencies {
-  implementation 'org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r'
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+  implementation 'org.eclipse.jgit:org.eclipse.jgit:6.2.0.202206071550-r'
   implementation "com.squareup.okhttp3:okhttp:4.12.0"
 }

package/android/src/main/java/expo/modules/externalstorage/GitNetwork.kt

@@ -133,10 +133,6 @@ internal object GitNetwork {
         cloneCommand.setBranchesToClone(listOf("refs/heads/$branch"))
       }
 
-      if (depth > 0) {
-        cloneCommand.setDepth(depth)
-      }
-
       if (noTags) {
         cloneCommand.setNoTags()
       }

package/app.plugin.js

@@ -1,7 +1,34 @@
-const { withAndroidManifest } = require('@expo/config-plugins');
+const { withAndroidManifest, withAppBuildGradle } = require('@expo/config-plugins');
+
+const DESUGAR_DEPENDENCY = "coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'";
+
+function applyCoreLibraryDesugaring(contents) {
+  if (!contents.includes('coreLibraryDesugaringEnabled')) {
+    if (contents.includes('compileOptions {')) {
+      contents = contents.replace(
+        /(compileOptions\s*\{)/,
+        '$1\n        coreLibraryDesugaringEnabled true',
+      );
+    } else {
+      contents = contents.replace(
+        /^(android\s*\{)/m,
+        '$1\n    compileOptions {\n        coreLibraryDesugaringEnabled true\n    }',
+      );
+    }
+  }
+
+  if (!contents.includes('desugar_jdk_libs')) {
+    contents = contents.replace(
+      /^(dependencies\s*\{)/m,
+      `$1\n    ${DESUGAR_DEPENDENCY}`,
+    );
+  }
+
+  return contents;
+}
 
 const withExternalStoragePermission = (config) => {
-  return withAndroidManifest(config, async (config) => {
+  config = withAndroidManifest(config, async (config) => {
     const androidManifest = config.modResults;
     
     if (!androidManifest.manifest['uses-permission']) {
@@ -20,6 +47,13 @@ const withExternalStoragePermission = (config) => {
 
     return config;
   });
+
+  config = withAppBuildGradle(config, (config) => {
+    config.modResults.contents = applyCoreLibraryDesugaring(config.modResults.contents);
+    return config;
+  });
+
+  return config;
 };
 
 module.exports = withExternalStoragePermission;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-tiddlywiki-filesystem-android-external-storage",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "Expo native module for TidGi-Mobile: filesystem I/O + TiddlyWiki .tid/.meta/.json batch parsing + git status in Kotlin (Android) and Swift (iOS)",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -10,7 +10,7 @@
     "clean": "expo-module clean",
     "lint": "expo-module lint",
     "test": "expo-module test",
-    "prepare": "tsc -p tsconfig.json"
+    "prepack": "tsc -p tsconfig.json"
   },
   "keywords": [
     "react-native",
@@ -42,6 +42,7 @@
     "ios",
     "expo-module.config.json",
     "src",
+    "tsconfig.json",
     "plugin.js",
     "app.plugin.js"
   ],

package/plugin.js

@@ -1,7 +1,34 @@
-const { withAndroidManifest } = require('@expo/config-plugins');
+const { withAndroidManifest, withAppBuildGradle } = require('@expo/config-plugins');
+
+const DESUGAR_DEPENDENCY = "coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'";
+
+function applyCoreLibraryDesugaring(contents) {
+  if (!contents.includes('coreLibraryDesugaringEnabled')) {
+    if (contents.includes('compileOptions {')) {
+      contents = contents.replace(
+        /(compileOptions\s*\{)/,
+        '$1\n        coreLibraryDesugaringEnabled true',
+      );
+    } else {
+      contents = contents.replace(
+        /^(android\s*\{)/m,
+        '$1\n    compileOptions {\n        coreLibraryDesugaringEnabled true\n    }',
+      );
+    }
+  }
+
+  if (!contents.includes('desugar_jdk_libs')) {
+    contents = contents.replace(
+      /^(dependencies\s*\{)/m,
+      `$1\n    ${DESUGAR_DEPENDENCY}`,
+    );
+  }
+
+  return contents;
+}
 
 const withExternalStoragePermission = (config) => {
-  return withAndroidManifest(config, async (config) => {
+  config = withAndroidManifest(config, async (config) => {
     const androidManifest = config.modResults;
     
     if (!androidManifest.manifest['uses-permission']) {
@@ -20,6 +47,13 @@ const withExternalStoragePermission = (config) => {
 
     return config;
   });
+
+  config = withAppBuildGradle(config, (config) => {
+    config.modResults.contents = applyCoreLibraryDesugaring(config.modResults.contents);
+    return config;
+  });
+
+  return config;
 };
 
 module.exports = withExternalStoragePermission;

package/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "expo-module-scripts/tsconfig.base",
+  "compilerOptions": {
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "include": ["src"]
+}