Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .fvm/fvm_config.json

This file was deleted.

4 changes: 4 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"flutter": "3.29.3",
"flavors": {}
}
31 changes: 0 additions & 31 deletions .github/workflows/android-build.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/flutter-lint.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/ios-build.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/macos-build.yaml

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: PR checks

on:
workflow_dispatch:
pull_request:
branches: [master]

jobs:
android-build:
name: Android example build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- uses: kuhnroyal/flutter-fvm-config-action/setup@v3
- run: flutter pub get
working-directory: example
- run: flutter build apk
working-directory: example
- uses: actions/upload-artifact@v4
with:
name: android-build
path: |
example/build/app/outputs/flutter-apk/app-release.apk
flutter-lint:
name: Flutter lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: kuhnroyal/flutter-fvm-config-action/setup@v3
- run: |
flutter pub get
flutter analyze

ios-build:
name: iOS build
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: kuhnroyal/flutter-fvm-config-action/setup@v3
- run: flutter pub get
working-directory: example
- run: flutter build ios --release --no-codesign
working-directory: example
- uses: actions/upload-artifact@v4
with:
name: ios-build
path: |
example/build/ios/iphoneos/Runner.app

macos-build:
name: MacOS Build
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: kuhnroyal/flutter-fvm-config-action/setup@v3
- run: flutter config --enable-macos-desktop
working-directory: example
- run: flutter build macos
working-directory: example
- uses: actions/upload-artifact@v4
with:
name: windows-build
path: |
example/build/macos/Build/Products/Release/flutter_nsd_example.app

windows-build:
name: Windows build
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: kuhnroyal/flutter-fvm-config-action/setup@v3
- run: |
cd example/
flutter config --enable-windows-desktop
flutter build windows
- uses: actions/upload-artifact@v4
with:
name: windows-build
path: |
example/build/windows/runner/Release/
28 changes: 0 additions & 28 deletions .github/workflows/windows-build.yaml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
.history
.svn/
migrate_working_dir/
.fvm/flutter_sdk

# IntelliJ related
*.iml
Expand Down Expand Up @@ -44,3 +43,6 @@ app.*.map.json
/android/app/debug
/android/app/profile
/android/app/release

# FVM Version Cache
.fvm/
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 30 additions & 48 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,62 +15,44 @@
*
*/

plugins {
id "com.android.library"
id "kotlin-android"
}

group 'com.nimroddayan.flutternsd'
version '1.0-SNAPSHOT'

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

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

rootProject.allprojects {
repositories {
google()
mavenCentral()
}
repositories {
google()
mavenCentral()
}
}

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

android {
// Conditional for compatibility with AGP <4.2.
if (project.android.hasProperty("namespace")) {
namespace 'com.nimroddayan.flutternsd'
}


compileSdkVersion 34

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 21
}
lintOptions {
disable 'InvalidPackage'
}

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

kotlinOptions {
jvmTarget = "1.8"
}
namespace = "com.nimroddayan.flutternsd"
compileSdkVersion 35

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

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11
}

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

defaultConfig {
minSdk = 21
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.jakewharton.timber:timber:5.0.1'
}
3 changes: 1 addition & 2 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
~
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.nimroddayan.flutternsd">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.NEARBY_DEVICES" />
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@ class FlutterNsdPlugin : FlutterPlugin, MethodCallHandler {
Timber.d("Plugin initialized successfully")
}

// This static function is optional and equivalent to onAttachedToEngine. It supports the old
// pre-Flutter-1.12 Android projects. You are encouraged to continue supporting
// plugin registration via this function while apps migrate to use the new Android APIs
// post-flutter-1.12 via https://flutter.dev/go/android-project-migration.
//
// It is encouraged to share logic between onAttachedToEngine and registerWith to keep
// them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called
// depending on the user's project. onAttachedToEngine or registerWith must both be defined
// in the same class.


override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
if (nsdManager == null) {
result.error("1000", "NsdManager not initialized", null)
Expand Down
4 changes: 0 additions & 4 deletions example/.fvm/fvm_config.json

This file was deleted.

4 changes: 4 additions & 0 deletions example/.fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"flutter": "3.29.3",
"flavors": {}
}
Loading
Loading