Merge pull request #68 from kiwix/adapt_libkiwix_991

kiwix · Nov 20, 2023 · 38373f9 · 38373f9
2 parents 8f2470d + 3ddfeb8
commit 38373f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -23,8 +23,8 @@ ext {
 }
 
 // Replace these versions with the latest available versions of libkiwix and libzim
-ext.libkiwix_version = "12.1.0"
-ext.libzim_version = "8.2.1"
+ext.libkiwix_version = "13.0.0"
+ext.libzim_version = "9.0.0"
 
 apply from: 'publish.gradle'
 android {

diff --git a/lib/src/main/cpp/libkiwix/kiwixserver.cpp b/lib/src/main/cpp/libkiwix/kiwixserver.cpp
@@ -35,7 +35,7 @@
 METHOD(void, setNativeServer, jobject jLibrary)
 {
   auto library = getPtr<kiwix::Library>(env, jLibrary);
-  SET_PTR(std::make_shared<NATIVE_TYPE>(library.get()));
+  SET_PTR(std::make_shared<NATIVE_TYPE>(library));
 } catch (std::exception& e) {
   throwException(env, "java/lang/Exception", "Error creating the server");
 } CATCH_EXCEPTION()

diff --git a/lib/src/main/cpp/libkiwix/library.cpp b/lib/src/main/cpp/libkiwix/library.cpp
@@ -31,7 +31,7 @@
 /* Kiwix Reader JNI functions */
 METHOD0(void, setNativeHandler)
 {
-  SET_PTR(std::make_shared<NATIVE_TYPE>());
+  SET_PTR(NATIVE_TYPE::create());
 } CATCH_EXCEPTION()
 
 DISPOSE

diff --git a/lib/src/main/cpp/libkiwix/manager.cpp b/lib/src/main/cpp/libkiwix/manager.cpp
@@ -31,7 +31,7 @@
 METHOD(void, allocate, jobject libraryObj)
 {
   auto lib = getPtr<kiwix::Library>(env, libraryObj);
-  SET_PTR(std::make_shared<NATIVE_TYPE>(lib.get()));
+  SET_PTR(std::make_shared<NATIVE_TYPE>(lib));
 } CATCH_EXCEPTION()
 
 DISPOSE