@kookyleo/graphviz-anywhere-rn 0.1.0 → 0.1.1

package/android/src/main/CMakeLists.txt

@@ -1,25 +1,26 @@
 cmake_minimum_required(VERSION 3.22.1)
 project(graphviz_jni)
 
-# Build the graphviz_api C library from source
-set(GRAPHVIZ_API_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src")
+# Link against the prebuilt core library downloaded during install.
+set(GRAPHVIZ_PREBUILT "${CMAKE_CURRENT_SOURCE_DIR}/../../libs/${ANDROID_ABI}")
+set(GRAPHVIZ_API_INCLUDE "${GRAPHVIZ_PREBUILT}/include")
+set(GRAPHVIZ_API_LIB "${GRAPHVIZ_PREBUILT}/lib/libgraphviz_api.so")
 
-add_library(graphviz_api SHARED
-    "${GRAPHVIZ_API_SRC}/graphviz_api.c"
-    jni/graphviz_jni.c
-)
+if(NOT EXISTS "${GRAPHVIZ_API_LIB}")
+  message(FATAL_ERROR "Missing prebuilt Graphviz core library: ${GRAPHVIZ_API_LIB}")
+endif()
 
-target_include_directories(graphviz_api PRIVATE
-    "${GRAPHVIZ_API_SRC}"
+add_library(graphviz_core SHARED IMPORTED)
+set_target_properties(graphviz_core PROPERTIES
+  IMPORTED_LOCATION "${GRAPHVIZ_API_LIB}"
 )
 
-# Link against the prebuilt Graphviz libraries for Android
-set(GRAPHVIZ_PREBUILT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../graphviz")
-
-target_include_directories(graphviz_api PRIVATE
-    "${GRAPHVIZ_PREBUILT}/include"
+add_library(graphviz_jni SHARED
+    jni/graphviz_jni.c
 )
 
+target_include_directories(graphviz_jni PRIVATE "${GRAPHVIZ_API_INCLUDE}")
+
 # Link Android log library for JNI
 find_library(log-lib log)
-target_link_libraries(graphviz_api ${log-lib})
+target_link_libraries(graphviz_jni graphviz_core ${log-lib})

package/android/src/main/java/com/graphviznative/GraphvizModule.java

@@ -40,7 +40,7 @@ public class GraphvizModule extends ReactContextBaseJavaModule {
     private long contextPtr = 0;
 
     static {
-        System.loadLibrary("graphviz_api");
+        System.loadLibrary("graphviz_jni");
     }
 
     public GraphvizModule(ReactApplicationContext reactContext) {

package/ios/GraphvizNative.podspec

@@ -9,19 +9,19 @@ Pod::Spec.new do |s|
   s.homepage     = package["repository"]["url"]
   s.license      = package["license"]
   s.authors      = package["author"]
-  s.source       = { :git => package["repository"]["url"], :tag => s.version }
+  s.source       = { :git => package["repository"]["url"], :tag => "v#{s.version}" }
 
   s.ios.deployment_target = "15.1"
   s.osx.deployment_target = "11.0"
 
-  s.source_files = "*.{h,m,mm}", "../src/*.{h,c}"
+  s.source_files = "*.{h,m,mm}"
   s.public_header_files = "GraphvizModule.h"
 
-  # Link against the prebuilt Graphviz static/shared libraries
-  s.preserve_paths = "../third_party/graphviz/**"
+  # Link against the prebuilt Graphviz wrapper downloaded by postinstall.
+  s.preserve_paths = "Frameworks/**"
   s.xcconfig = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/../src\"",
-    "LIBRARY_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/../third_party/graphviz/lib\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Frameworks/include\"",
+    "LIBRARY_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Frameworks/lib\"",
   }
   s.libraries = "graphviz_api"
 

package/lib/commonjs/index.js

@@ -7,7 +7,7 @@ exports.default = exports.GraphvizErrorCode = void 0;
 exports.getVersion = getVersion;
 exports.renderDot = renderDot;
 var _reactNative = require("react-native");
-const LINKING_ERROR = `The package 'graphviz-anywhere-react-native' doesn't seem to be linked. Make sure:\n\n` + _reactNative.Platform.select({
+const LINKING_ERROR = `The package '@kookyleo/graphviz-anywhere-rn' doesn't seem to be linked. Make sure:\n\n` + _reactNative.Platform.select({
   ios: '- You have run `pod install`\n',
   macos: '- You have run `pod install`\n',
   android: '',

package/lib/module/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { NativeModules, Platform } from 'react-native';
-const LINKING_ERROR = `The package 'graphviz-anywhere-react-native' doesn't seem to be linked. Make sure:\n\n` + Platform.select({
+const LINKING_ERROR = `The package '@kookyleo/graphviz-anywhere-rn' doesn't seem to be linked. Make sure:\n\n` + Platform.select({
   ios: '- You have run `pod install`\n',
   macos: '- You have run `pod install`\n',
   android: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kookyleo/graphviz-anywhere-rn",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "React Native package for graphviz-anywhere with native binary support",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -21,7 +21,6 @@
     "macos",
     "windows",
     "scripts",
-    "graphviz-anywhere-react-native.podspec",
     "!**/__tests__"
   ],
   "publishConfig": {

package/scripts/download-native.js

@@ -62,7 +62,7 @@ async function main() {
 
   for (const { name, dest } of downloads) {
     const url = `${RELEASE_URL}/${name}`;
-    const tempFile = path.join(__dirname, '../../', name);
+    const tempFile = path.join(__dirname, '..', name);
 
     try {
       // Create destination directory

package/src/index.ts

@@ -1,7 +1,7 @@
 import { NativeModules, Platform } from 'react-native';
 
 const LINKING_ERROR =
-  `The package 'graphviz-anywhere-react-native' doesn't seem to be linked. Make sure:\n\n` +
+  `The package '@kookyleo/graphviz-anywhere-rn' doesn't seem to be linked. Make sure:\n\n` +
   Platform.select({
     ios: '- You have run `pod install`\n',
     macos: '- You have run `pod install`\n',