Skip to content

Commit

Permalink
🏗️ Migrate to SwiftPackageManager
Browse files Browse the repository at this point in the history
  • Loading branch information
istornz committed Dec 19, 2024
1 parent 2295f24 commit a5de8a1
Show file tree
Hide file tree
Showing 15 changed files with 93 additions and 61 deletions.
14 changes: 7 additions & 7 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9"
revision: "17025dd88227cd9532c33fa78f5250d548d87e9a"
channel: "stable"

project_type: plugin
Expand All @@ -13,14 +13,14 @@ project_type: plugin
migration:
platforms:
- platform: root
create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
- platform: android
create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
- platform: ios
create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a

# User provided section

Expand Down
36 changes: 17 additions & 19 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
group 'com.flutter_live_activities'
version '1.0-SNAPSHOT'
group = "com.example.live_activities"
version = "1.0-SNAPSHOT"

buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = "1.8.22"
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath("com.android.tools.build:gradle:8.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}

Expand All @@ -21,37 +21,35 @@ allprojects {
}
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: "com.android.library"
apply plugin: "kotlin-android"

android {
if (project.android.hasProperty("namespace")) {
namespace 'com.flutter_live_activities'
}
namespace = "com.example.live_activities"

compileSdkVersion 33
compileSdk = 35

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = JavaVersion.VERSION_11
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
main.java.srcDirs += "src/main/kotlin"
test.java.srcDirs += "src/test/kotlin"
}

defaultConfig {
minSdkVersion 19
minSdk = 21
}

dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test'
testImplementation 'org.mockito:mockito-core:5.0.0'
testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.mockito:mockito-core:5.0.0")
}

testOptions {
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = 'flutter_live_activities'
rootProject.name = 'live_activities'
3 changes: 2 additions & 1 deletion android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.flutter_live_activities">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.live_activities">
</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flutter_live_activities
package com.example.live_activities

import androidx.annotation.NonNull

Expand All @@ -8,8 +8,8 @@ import io.flutter.plugin.common.MethodChannel
import io.flutter.plugin.common.MethodChannel.MethodCallHandler
import io.flutter.plugin.common.MethodChannel.Result

/** FlutterLiveActivitiesPlugin */
class FlutterLiveActivitiesPlugin: FlutterPlugin, MethodCallHandler {
/** LiveActivitiesPlugin */
class LiveActivitiesPlugin: FlutterPlugin, MethodCallHandler {
/// The MethodChannel that will the communication between Flutter and native Android
///
/// This local reference serves to register the plugin with the Flutter Engine and unregister it
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.flutter_live_activities
package com.example.live_activities

import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
Expand All @@ -13,10 +13,10 @@ import org.mockito.Mockito
* you can run them directly from IDEs that support JUnit such as Android Studio.
*/

internal class FlutterLiveActivitiesPluginTest {
internal class LiveActivitiesPluginTest {
@Test
fun onMethodCall_getPlatformVersion_returnsExpectedValue() {
val plugin = FlutterLiveActivitiesPlugin()
val plugin = LiveActivitiesPlugin()

val call = MethodCall("getPlatformVersion", null)
val mockResult: MethodChannel.Result = Mockito.mock(MethodChannel.Result::class.java)
Expand Down
2 changes: 1 addition & 1 deletion ios/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ Icon?

/Flutter/Generated.xcconfig
/Flutter/ephemeral/
/Flutter/flutter_export_environment.sh
/Flutter/flutter_export_environment.sh
Empty file removed ios/Assets/.gitkeep
Empty file.
4 changes: 0 additions & 4 deletions ios/Classes/LiveActivitiesPlugin.h

This file was deleted.

15 changes: 0 additions & 15 deletions ios/Classes/LiveActivitiesPlugin.m

This file was deleted.

10 changes: 8 additions & 2 deletions ios/live_activities.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ A new Flutter plugin project.
s.license = { :file => '../LICENSE' }
s.author = { 'Your Company' => '[email protected]' }
s.source = { :path => '.' }
s.source_files = 'Classes/**/*'
s.source_files = 'live_activities/Sources/live_activities/**/*'
s.dependency 'Flutter'
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'

# Flutter.framework does not contain a i386 slice.
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
s.swift_version = '5.0'

# If your plugin requires a privacy manifest, for example if it uses any
# required reason APIs, update the PrivacyInfo.xcprivacy file to describe your
# plugin's privacy impact, and then uncomment this line. For more information,
# see https://developer.apple.com/documentation/bundleresources/privacy_manifest_files
# s.resource_bundles = {'live_activities_privacy' => ['live_activities/Sources/live_activities/PrivacyInfo.xcprivacy']}
end
32 changes: 32 additions & 0 deletions ios/live_activities/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// swift-tools-version: 5.9
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "live_activities",
platforms: [
.iOS("12.0")
],
products: [
.library(name: "live-activities", targets: ["live_activities"])
],
dependencies: [],
targets: [
.target(
name: "live_activities",
dependencies: [],
resources: [
// If your plugin requires a privacy manifest, for example if it uses any required
// reason APIs, update the PrivacyInfo.xcprivacy file to describe your plugin's
// privacy impact, and then uncomment these lines. For more information, see
// https://developer.apple.com/documentation/bundleresources/privacy_manifest_files
// .process("PrivacyInfo.xcprivacy"),

// If you have other resources that need to be bundled with your plugin, refer to
// the following instructions to add them:
// https://developer.apple.com/documentation/xcode/bundling-resources-with-a-swift-package
]
)
]
)
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FlutterAlertConfig {
}
}

public class SwiftLiveActivitiesPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
public class LiveActivitiesPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
private var urlSchemeSink: FlutterEventSink?
private var appGroupId: String?
private var urlScheme: String?
Expand All @@ -32,7 +32,7 @@ public class SwiftLiveActivitiesPlugin: NSObject, FlutterPlugin, FlutterStreamHa
let urlSchemeChannel = FlutterEventChannel(name: "live_activities/url_scheme", binaryMessenger: registrar.messenger())
let activityStatusChannel = FlutterEventChannel(name: "live_activities/activity_status", binaryMessenger: registrar.messenger())

let instance = SwiftLiveActivitiesPlugin()
let instance = LiveActivitiesPlugin()

registrar.addMethodCallDelegate(instance, channel: channel)
urlSchemeChannel.setStreamHandler(instance)
Expand Down
14 changes: 14 additions & 0 deletions ios/live_activities/Sources/live_activities/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyTracking</key>
<false/>
</dict>
</plist>
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.8
flutter_app_group_directory: ^1.0.2+2
flutter_app_group_directory: ^1.1.0
path_provider: ^2.1.5
image: ^4.3.0

Expand All @@ -39,5 +39,5 @@ flutter:
ios:
pluginClass: LiveActivitiesPlugin
android:
package: com.flutter_live_activities
pluginClass: FlutterLiveActivitiesPlugin
package: com.example.live_activities
pluginClass: LiveActivitiesPlugin

0 comments on commit a5de8a1

Please sign in to comment.