CHANGELOG.md

@@ -1,9 +1,3 @@
-## 1.1.1
-
-- fix: lookup library in correct locations
-
-- feat: add ability to pass optional notes location to `Note.list(...)` method
-
 ## 1.1.0
 
 - feat: add ability to get and set libgit2 global options
@@ -12,7 +6,7 @@
 
 - feat: add ability to remove entries in index with `resetDefault(...)` method
 
-- feat: add ability to compare objects (value based equality)
+- feat: add ability to compare objects (value based equality).
 
   Note: comparison of Repository objects have naive implementation. Comparison is based on repository path, and previously loaded into memory index, odb, etc. might be different. Use with caution.
 

README.md

@@ -49,13 +49,13 @@ print(Libgit2.version);
 
 **Note**: The following steps only required if you are using package in Dart application (Flutter application will have libgit2 library bundled automatically when you build for release).
 
-After adding the package as dependency you should run:
+After compiling the application you should run:
 
 ```shell
 dart run libgit2dart:setup
 ```
 
-That'll copy the prebuilt libgit2 library for your platform into `.dart_tool/libgit2/<platform>/` which you'll need to add to the same folder as your executable after compilation.
+That'll copy the prebuilt libgit2 library for your platform into `.dart_tool/libgit2/<platform>/` which you'll need to add to the same folder as your executable.
 
 If you upgrade the version of libgit2dart package in your dependencies you should run the following commands to have the latest libgit2 library for your platform to provide with your application:
 

bin/setup.dart

@@ -23,23 +23,15 @@ Future<void> copyLibrary(String platform) async {
       );
     }
   } else {
-    String? checkCache(PubCache pubCache) =>
-        pubCache.getLatestVersion('libgit2dart')?.resolve()?.location.path;
-
-    final libPath = checkCache(PubCache()) ??
-        checkCache(
-          PubCache(
-            Directory(
-              path.join(Platform.environment['FLUTTER_ROOT']!, '.pub-cache'),
-            ),
-          ),
-        );
+    final pubCache = PubCache();
+    final pubCacheDir =
+        pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
     final libName = getLibName();
 
     stdout.writeln('Copying libgit2 for $platform');
     final destination = path.join(libDir, platform);
     Directory(destination).createSync(recursive: true);
-    File(path.join(libPath!, platform, libName)).copySync(
+    File(path.join(pubCacheDir.path, platform, libName)).copySync(
       path.join(destination, libName),
     );
 

lib/src/util.dart

@@ -6,6 +6,7 @@ import 'dart:io';
 import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
 import 'package:libgit2dart/src/bindings/libgit2_opts_bindings.dart';
 import 'package:path/path.dart' as path;
+import 'package:pub_cache/pub_cache.dart';
 
 const libgit2Version = '1.4.3';
 final libDir = path.join('.dart_tool', 'libgit2');
@@ -31,8 +32,13 @@ bool _doesFileExist(String path) {
 
 /// Returns path to dynamic library if found.
 String? _resolveLibPath(String name) {
+  var libPath = path.join(Directory.current.path, name);
+
+  // If lib is in Present Working Directory.
+  if (_doesFileExist(libPath)) return libPath;
+
   // If lib is in Present Working Directory's '.dart_tool/libgit2/[platform]' folder.
-  var libPath = path.join(
+  libPath = path.join(
     Directory.current.path,
     libDir,
     Platform.operatingSystem,
@@ -44,20 +50,33 @@ String? _resolveLibPath(String name) {
   libPath = path.join(Directory.current.path, Platform.operatingSystem, name);
   if (_doesFileExist(libPath)) return libPath;
 
-  // If lib is in executable's folder.
-  libPath = path.join(path.dirname(Platform.resolvedExecutable), name);
+  String checkCache(PubCache pubCache) {
+    final pubCacheDir =
+        pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
+    return path.join(pubCacheDir.path, Platform.operatingSystem, name);
+  }
+
+  // If lib is in Dart's '.pub_cache' folder.
+  libPath = checkCache(PubCache());
   if (_doesFileExist(libPath)) return libPath;
 
-  // If lib is in executable's bundled 'lib' folder.
-  libPath = path.join(path.dirname(Platform.resolvedExecutable), 'lib', name);
-  if (_doesFileExist(libPath)) return libPath;
+  // If lib is in Flutter's '.pub_cache' folder.
+  final env = Platform.environment;
+  if (env.containsKey('FLUTTER_ROOT')) {
+    final flutterPubCache =
+        PubCache(Directory(path.join(env['FLUTTER_ROOT']!, '.pub-cache')));
+    libPath = checkCache(flutterPubCache);
+    if (_doesFileExist(libPath)) return libPath;
+  }
 
   return null;
 }
 
 DynamicLibrary loadLibrary(String name) {
   try {
-    return DynamicLibrary.open(_resolveLibPath(name) ?? name);
+    return DynamicLibrary.open(
+      _resolveLibPath(name) ?? name,
+    );
   } catch (e) {
     stderr.writeln(
       'Failed to open the library. Make sure that libgit2 library is bundled '

macos/libgit2dart.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'libgit2dart'
-  s.version          = '1.1.1'
+  s.version          = '1.1.0'
   s.summary          = 'Dart bindings to libgit2.'
   s.description      = <<-DESC
 Dart bindings to libgit2.

pubspec.yaml

@@ -2,7 +2,7 @@ name: libgit2dart
 
 description: Dart bindings to libgit2, provides ability to use libgit2 library in Dart and Flutter.
 
-version: 1.1.1
+version: 1.1.0
 
 homepage: https://github.com/SkinnyMind/libgit2dart