Skip to content

fix(android): set Pigeon Kotlin package for AGP 8 / Kotlin 2.2+ #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BriceFab wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −7
Open

fix(android): set Pigeon Kotlin package for AGP 8 / Kotlin 2.2+ #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions wakelock_plus/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [Unreleased]
* Fix Android build on AGP 8 / Kotlin 2.2+ by setting Pigeon `KotlinOptions.package`
so generated API types are not left in the default package (fixes missing
`WakelockPlusPlugin` / `cannot find symbol` in `GeneratedPluginRegistrant`).

## [1.7.0]
* [#134](https://github.com/fluttercommunity/wakelock_plus/pull/134): fix(android): defer wakelock toggle when no activity is attached. Thanks [sadaqatdev](https://github.com/sadaqatdev).
* [#136](https://github.com/fluttercommunity/wakelock_plus/pull/136): Migrated plugin to Built-in Kotlin Gradle Plugin (KGP). Thanks [drmirk](https://github.com/drmirk).
Expand Down
2 changes: 0 additions & 2 deletions wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/Wakelock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package dev.fluttercommunity.plus.wakelock

import IsEnabledMessage
import ToggleMessage
import android.app.Activity
import android.view.WindowManager

Expand Down
2 changes: 2 additions & 0 deletions ...plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

package dev.fluttercommunity.plus.wakelock


import android.util.Log
import io.flutter.plugin.common.BasicMessageChannel
Expand Down
4 changes: 0 additions & 4 deletions ...ock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package dev.fluttercommunity.plus.wakelock

import IsEnabledMessage
import ToggleMessage
import WakelockPlusApi

import io.flutter.embedding.engine.plugins.FlutterPlugin
import io.flutter.embedding.engine.plugins.activity.ActivityAware
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
Expand Down
5 changes: 4 additions & 1 deletion wakelock_plus/pigeons/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ class IsEnabledMessage {
prefix: 'WAKELOCKPLUS',
headerIncludePath: './include/wakelock_plus/messages.g.h',
),
kotlinOptions: KotlinOptions(errorClassName: "WakelockPlusFlutterError"),
kotlinOptions: KotlinOptions(
errorClassName: "WakelockPlusFlutterError",
package: "dev.fluttercommunity.plus.wakelock",
),
kotlinOut:
'android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt',
),
Expand Down