[Fix] Kotlin naming conflicts (#300)

* Fix Pigeon migration by specifying Kotlin package and refactoring imports * Refactor imports
gdelataillade · Dec 10, 2024 · 9c8c523 · 9c8c523
1 parent 767380f
commit 9c8c523
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/alarm/AlarmPlugin.kt b/android/src/main/kotlin/com/gdelataillade/alarm/alarm/AlarmPlugin.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.alarm
 
-import AlarmApi
-import AlarmTriggerApi
+import com.gdelataillade.alarm.generated.AlarmApi
+import com.gdelataillade.alarm.generated.AlarmTriggerApi
 import android.app.Activity
 import android.app.KeyguardManager
 import android.content.Context

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/api/AlarmApiImpl.kt b/android/src/main/kotlin/com/gdelataillade/alarm/api/AlarmApiImpl.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.api
 
-import AlarmApi
-import AlarmSettingsWire
+import com.gdelataillade.alarm.generated.AlarmApi
+import com.gdelataillade.alarm.generated.AlarmSettingsWire
 import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.Context

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/generated/FlutterBindings.g.kt b/android/src/main/kotlin/com/gdelataillade/alarm/generated/FlutterBindings.g.kt
@@ -1,12 +1,15 @@
-// Autogenerated from Pigeon (v22.6.3), do not edit directly.
+// Autogenerated from Pigeon (v22.7.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
+package com.gdelataillade.alarm.generated
 
 import android.util.Log
 import io.flutter.plugin.common.BasicMessageChannel
 import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
 import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt b/android/src/main/kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.models
 
-import AlarmSettingsWire
-import kotlinx.serialization.KSerializer
+import com.gdelataillade.alarm.generated.AlarmSettingsWire
+import com.google.gson.*
 import java.util.Date
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/models/NotificationSettings.kt b/android/src/main/kotlin/com/gdelataillade/alarm/models/NotificationSettings.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.models
 
-import NotificationSettingsWire
-import kotlinx.serialization.Serializable
+import com.gdelataillade.alarm.generated.NotificationSettingsWire
+import com.google.gson.Gson
 
 @Serializable
 data class NotificationSettings(

diff --git a/ios/Classes/generated/FlutterBindings.g.swift b/ios/Classes/generated/FlutterBindings.g.swift
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.6.3), do not edit directly.
+// Autogenerated from Pigeon (v22.7.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -97,7 +97,6 @@ struct AlarmSettingsWire {
   var androidFullScreenIntent: Bool
 
 
-
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AlarmSettingsWire? {
     let id = pigeonVar_list[0] as! Int64
@@ -203,7 +202,6 @@ struct NotificationSettingsWire {
   var icon: String? = nil
 
 
-
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> NotificationSettingsWire? {
     let title = pigeonVar_list[0] as! String

diff --git a/lib/src/generated/platform_bindings.g.dart b/lib/src/generated/platform_bindings.g.dart
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.6.3), do not edit directly.
+// Autogenerated from Pigeon (v22.7.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 

diff --git a/pigeons/alarm_api.dart b/pigeons/alarm_api.dart
@@ -10,6 +10,9 @@ import 'package:pigeon/pigeon.dart';
     swiftOut: 'ios/Classes/generated/FlutterBindings.g.swift',
     kotlinOut:
         'android/src/main/kotlin/com/gdelataillade/alarm/generated/FlutterBindings.g.kt',
+    kotlinOptions: KotlinOptions(
+      package: 'com.gdelataillade.alarm.generated',
+    ),
   ),
 )
 class AlarmSettingsWire {