Merge branch 'plugin-rename'

bindings/dart/android/build.gradle

@@ -1,4 +1,4 @@
-group 'ie.equalit.ouisync_plugin'
+group 'org.equalitie.ouisync'
 version '1.0-SNAPSHOT'
 
 buildscript {

bindings/dart/android/settings.gradle

@@ -1 +1 @@
-rootProject.name = 'ouisync_plugin'
+rootProject.name = 'ouisync'

bindings/dart/android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="ie.equalit.ouisync_plugin"
+  package="org.equalitie.ouisync"
   xmlns:tools="http://schemas.android.com/tools">
 
   <application>

bindings/dart/android/src/main/kotlin/ie/equalit/ouisync_plugin/AbstractFileProvider.kt → bindings/dart/android/src/main/kotlin/org/equalitie/ouisync/AbstractFileProvider.kt

@@ -1,4 +1,4 @@
-package ie.equalit.ouisync_plugin
+package org.equalitie.ouisync
 
 import android.content.ContentProvider
 import android.content.ContentValues

bindings/dart/android/src/main/kotlin/ie/equalit/ouisync_plugin/LegacyCompatCursorWrapper.java → bindings/dart/android/src/main/kotlin/org/equalitie/ouisync/LegacyCompatCursorWrapper.java

@@ -1,4 +1,4 @@
-package ie.equalit.ouisync_plugin;
+package org.equalitie.ouisync;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
@@ -202,4 +202,4 @@ private boolean cursorHasDataColumn() {
     private boolean cursorHasMimeTypeColumn() {
         return(fakeMimeTypeColumn==-1);
     }
-}
+}

bindings/dart/android/src/main/kotlin/ie/equalit/ouisync_plugin/OuisyncPlugin.kt → bindings/dart/android/src/main/kotlin/org/equalitie/ouisync/OuisyncPlugin.kt

@@ -1,4 +1,4 @@
-package ie.equalit.ouisync_plugin
+package org.equalitie.ouisync
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -29,7 +29,7 @@ class OuisyncPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
 
   companion object {
     private val TAG = OuisyncPlugin::class.java.simpleName
-    private const val CHANNEL_NAME = "ie.equalit.ouisync_plugin"
+    private const val CHANNEL_NAME = "org.equalitie.ouisync"
 
     private var channels = HashSet<MethodChannel>()
 

bindings/dart/android/src/main/kotlin/ie/equalit/ouisync_plugin/PipeProvider.kt → bindings/dart/android/src/main/kotlin/org/equalitie/ouisync/PipeProvider.kt

@@ -1,4 +1,4 @@
-package ie.equalit.ouisync_plugin
+package org.equalitie.ouisync
 
 import android.content.Context
 import android.content.res.AssetFileDescriptor

bindings/dart/example/android/app/build.gradle

@@ -35,7 +35,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "ie.equalit.ouisync_plugin_example"
+        applicationId "org.equalitie.ouisync_example"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()

bindings/dart/example/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ie.equalit.ouisync_plugin_example">
+    package="org.equalitie.ouisync_example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

bindings/dart/example/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ie.equalit.ouisync_plugin_example"
+    package="org.equalitie.ouisync_example"
      xmlns:tools="http://schemas.android.com/tools">
    <application
         android:label="ouisync_plugin_example"
@@ -35,7 +35,7 @@
         </activity>
         <provider
           tools:replace="android:authorities"
-          android:name="ie.equalit.ouisync_plugin.PipeProvider"
+          android:name="org.equalitie.ouisync.PipeProvider"
           android:authorities="${applicationId}.pipe"
           android:exported="true"/>
         <!-- Don't delete the meta-data below.

bindings/dart/example/android/app/src/main/kotlin/ie/equalit/ouisync_plugin_example/MainActivity.kt

@@ -1,4 +1,4 @@
-package ie.equalit.ouisync_plugin_example
+package org.equalitie.ouisync_example
 
 import io.flutter.embedding.android.FlutterActivity
 

bindings/dart/example/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ie.equalit.ouisync_plugin_example">
+    package="org.equalitie.ouisync_example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

bindings/dart/example/lib/main.dart

@@ -4,8 +4,8 @@ import 'dart:async';
 import 'package:async/async.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:ouisync_plugin/ouisync_plugin.dart';
-import 'package:ouisync_plugin/native_channels.dart';
+import 'package:ouisync/ouisync.dart';
+import 'package:ouisync/native_channels.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 
@@ -210,15 +210,15 @@ class _MyAppState extends State<MyApp> {
       onPressed: () async {
         Navigator.of(context).pop();
         await nativeChannels.previewOuiSyncFile(
-            "ie.equalit.ouisync_plugin_example", path, size);
+            "org.equalitie.ouisync_example", path, size);
       },
     );
     Widget shareFileButton = TextButton(
         child: Text("Share"),
         onPressed: () async {
           Navigator.of(context).pop();
           await nativeChannels.shareOuiSyncFile(
-              "ie.equalit.ouisync_plugin_example", path, size);
+              "org.equalitie.ouisync_example", path, size);
         });
     Widget cancelButton = TextButton(
       child: Text("Cancel"),

bindings/dart/example/linux/CMakeLists.txt

@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "ouisync_plugin_example")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "ie.equalit.ouisync_plugin")
+set(APPLICATION_ID "org.equalitie.ouisync")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.

bindings/dart/example/macos/Runner.xcodeproj/project.pbxproj

@@ -478,7 +478,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = ie.equalit.ouisyncPluginExample.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = org.equalitie.ouisyncExample.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ouisync_plugin_example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ouisync_plugin_example";
@@ -493,7 +493,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = ie.equalit.ouisyncPluginExample.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = org.equalitie.ouisyncExample.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ouisync_plugin_example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ouisync_plugin_example";
@@ -508,7 +508,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = ie.equalit.ouisyncPluginExample.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = org.equalitie.ouisyncExample.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ouisync_plugin_example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ouisync_plugin_example";

bindings/dart/example/macos/Runner/Configs/AppInfo.xcconfig

@@ -8,7 +8,7 @@
 PRODUCT_NAME = ouisync_plugin_example
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = ie.equalit.ouisyncPluginExample
+PRODUCT_BUNDLE_IDENTIFIER = org.equalitie.ouisyncExample
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2024 ie.equalit. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2024 org.equalitie. All rights reserved.

bindings/dart/example/pubspec.yaml

@@ -1,5 +1,5 @@
 name: ouisync_plugin_example
-description: Demonstrates how to use the ouisync_plugin plugin.
+description: Demonstrates how to use the ouisync plugin.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `pub publish`. This is preferred for private packages.
@@ -13,9 +13,9 @@ dependencies:
   flutter:
     sdk: flutter
 
-  ouisync_plugin:
+  ouisync:
     # When depending on this package from a real application you should use:
-    #   ouisync_plugin: ^x.y.z
+    #   ouisync: ^x.y.z
     # See https://dart.dev/tools/pub/dependencies#version-constraints
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.

bindings/dart/example/windows/runner/Runner.rc

@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "ie.equalit" "\0"
+            VALUE "CompanyName", "org.equalitie" "\0"
             VALUE "FileDescription", "ouisync_plugin_example" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "ouisync_plugin_example" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2022 ie.equalit. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2024 org.equalitie. All rights reserved." "\0"
             VALUE "OriginalFilename", "ouisync_plugin_example.exe" "\0"
             VALUE "ProductName", "ouisync_plugin_example" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"

bindings/dart/lib/client.dart

@@ -8,7 +8,7 @@ import 'package:ffi/ffi.dart';
 import 'package:msgpack_dart/msgpack_dart.dart';
 
 import 'bindings.dart';
-import 'ouisync_plugin.dart' show Error;
+import 'ouisync.dart' show Error;
 
 /// Client to interface with ouisync
 class Client {

bindings/dart/lib/local_secret.dart

@@ -1,4 +1,4 @@
-part of 'ouisync_plugin.dart';
+part of 'ouisync.dart';
 
 // Used for opening a reository.
 sealed class LocalSecret {

bindings/dart/lib/native_channels.dart

@@ -3,7 +3,7 @@ import 'dart:collection';
 
 import 'package:flutter/services.dart';
 
-import 'ouisync_plugin.dart' show Session, Repository, File;
+import 'ouisync.dart' show Session, Repository, File;
 
 /// Enum for handling the reponse from the previewFile method
 enum PreviewFileResult {
@@ -26,8 +26,7 @@ class NativeChannels {
     _channel.setMethodCallHandler(_methodHandler);
   }
 
-  final MethodChannel _channel =
-      const MethodChannel('ie.equalit.ouisync_plugin');
+  final MethodChannel _channel = const MethodChannel('org.equalitie.ouisync');
 
   // We need this session` variable to be able to close the session
   // from inside the java/kotlin code when the plugin is detached from the

bindings/dart/linux/CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.19)
 
 # Project-level configuration.
 
-set(PROJECT_NAME "ouisync_plugin")
+set(PROJECT_NAME "ouisync")
 
 project(${PROJECT_NAME} LANGUAGES CXX)
 
@@ -34,7 +34,7 @@ corrosion_import_crate(
 
 # This value is used when generating builds using this plugin, so it must
 # not be changed.
-set(PLUGIN_NAME "ouisync_plugin_plugin")
+set(PLUGIN_NAME "ouisync_plugin")
 
 # Define the plugin library target. Its name must not be changed (see comment
 # on PLUGIN_NAME above).
@@ -67,6 +67,6 @@ target_link_libraries(${PLUGIN_NAME} PUBLIC ouisync_ffi)
 # List of absolute paths to libraries that should be bundled with the plugin.
 # This list could contain prebuilt libraries, or libraries created by an
 # external build triggered from this build file.
-set(ouisync_plugin_bundled_libraries "${CMAKE_CURRENT_BINARY_DIR}/libouisync_ffi.so"
+set(ouisync_bundled_libraries "${CMAKE_CURRENT_BINARY_DIR}/libouisync_ffi.so"
   PARENT_SCOPE
 )

bindings/dart/linux/ouisync_plugin.cc

@@ -1,4 +1,4 @@
-#include "include/ouisync_plugin/ouisync_plugin.h"
+#include "include/ouisync/ouisync_plugin.h"
 
 #include <flutter_linux/flutter_linux.h>
 #include <gtk/gtk.h>

bindings/dart/pubspec.yaml

@@ -1,4 +1,4 @@
-name: ouisync_plugin
+name: ouisync
 description: A flutter plugin providing high-level dart API for the ouisync native library
 version: 0.1.0
 homepage: null
@@ -35,7 +35,7 @@ flutter:
   plugin:
     platforms:
       android:
-        package: ie.equalit.ouisync_plugin
+        package: org.equalitie.ouisync
         pluginClass: OuisyncPlugin
       ios:
         pluginClass: OuisyncPlugin

bindings/dart/test/add_file_folder_syncing_test.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io' as io;
 
-import 'package:ouisync_plugin/ouisync_plugin.dart';
+import 'package:ouisync/ouisync.dart';
 import 'package:test/test.dart';
 
 void main() {

bindings/dart/test/close_repo_async_test.dart

@@ -1,6 +1,6 @@
 import 'dart:io' as io;
 import 'package:test/test.dart';
-import 'package:ouisync_plugin/ouisync_plugin.dart';
+import 'package:ouisync/ouisync.dart';
 
 void main() {
   late io.Directory temp;

bindings/dart/test/move_entry_test.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io' as io;
 
-import 'package:ouisync_plugin/ouisync_plugin.dart';
+import 'package:ouisync/ouisync.dart';
 import 'package:test/test.dart';
 
 void main() {

bindings/dart/test/multiple_nodes_test.dart

@@ -1,6 +1,6 @@
 import 'dart:io' as io;
 import 'package:test/test.dart';
-import 'package:ouisync_plugin/ouisync_plugin.dart';
+import 'package:ouisync/ouisync.dart';
 
 void main() {
   late io.Directory temp;

bindings/dart/test/ouisync_plugin_test.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io' as io;
 import 'package:test/test.dart';
-import 'package:ouisync_plugin/ouisync_plugin.dart';
-import 'package:ouisync_plugin/state_monitor.dart';
+import 'package:ouisync/ouisync.dart';
+import 'package:ouisync/state_monitor.dart';
 
 void main() {
   late io.Directory temp;

bindings/dart/test/repo_secrets_test.dart

@@ -1,6 +1,6 @@
 import 'dart:io' as io;
 import 'package:test/test.dart';
-import 'package:ouisync_plugin/ouisync_plugin.dart';
+import 'package:ouisync/ouisync.dart';
 
 void main() {
   late io.Directory temp;

bindings/dart/test/session_test.dart

@@ -1,6 +1,6 @@
 import 'dart:io' as io;
 import 'package:test/test.dart';
-import 'package:ouisync_plugin/ouisync_plugin.dart';
+import 'package:ouisync/ouisync.dart';
 
 void main() {
   late io.Directory temp;

bindings/dart/windows/CMakeLists.txt

@@ -2,7 +2,7 @@
 # https://github.com/corrosion-rs/corrosion
 cmake_minimum_required(VERSION 3.19)
 
-set(PROJECT_NAME "ouisync_plugin")
+set(PROJECT_NAME "ouisync")
 
 project(${PROJECT_NAME} LANGUAGES CXX)
 
@@ -37,7 +37,7 @@ corrosion_set_env_vars(ouisync_ffi "DOKAN_DLL_OUTPUT_PATH=${DOKAN_DLL_OUTPUT_PAT
 
 # This value is used when generating builds using this plugin, so it must
 # not be changed
-set(PLUGIN_NAME "ouisync_plugin_plugin")
+set(PLUGIN_NAME "ouisync_plugin")
 
 add_library(${PLUGIN_NAME} SHARED
   "ouisync_plugin.cpp"
@@ -51,7 +51,7 @@ target_include_directories(${PLUGIN_NAME} INTERFACE
 target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin)
 
 # List of absolute paths to libraries that should be bundled with the plugin
-set(ouisync_plugin_bundled_libraries
+set(ouisync_bundled_libraries
   ${CMAKE_CURRENT_BINARY_DIR}/ouisync_ffi.dll
   ${DOKAN_DLL_OUTPUT_PATH}/dokan2.dll
   PARENT_SCOPE

bindings/dart/windows/ouisync_plugin.cpp

@@ -1,4 +1,4 @@
-#include "include/ouisync_plugin/ouisync_plugin.h"
+#include "include/ouisync/ouisync_plugin.h"
 
 // This must be included before many other Windows headers.
 #include <windows.h>