Merge pull request #18 from vicdotdevelop/update

Update android, ios

Author: Shakle

.github/workflows/pre-merge-checks.yml

@@ -17,20 +17,20 @@ jobs:
     steps:
       # Checkout repository
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       # Set up Flutter
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.29.0'  # Specify exact version instead of just 'stable'
+          flutter-version: '3.38.5'  # Specify exact version instead of just 'stable'
           channel: 'stable'
 
       # Cache Flutter dependencies to speed up workflow
       - name: Cache Flutter dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.pub-cache
           key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.yaml') }}

.github/workflows/publish-to-pubdev.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.29.2'
+          flutter-version: '3.38.5'
           channel: 'stable'
       - name: Install dependencies 📦
         run: flutter pub get

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0
+* Support of latest Android and iOS
+* Improvements on example app
+
 ## 0.2.3
 
 * Minor changes

analysis_options.yaml

@@ -5,4 +5,8 @@ formatter:
 
 linter:
   rules:
-    lines_longer_than_80_chars: false
+    lines_longer_than_80_chars: false
+    prefer_const_constructors: true
+    prefer_const_declarations: true
+    prefer_const_literals_to_create_immutables: true
+    avoid_catches_without_on_clauses: false

android/.gitignore

@@ -6,3 +6,4 @@
 .DS_Store
 /build
 /captures
+/.cxx/*

android/build.gradle.kts

@@ -1,8 +1,8 @@
-val kotlinVersion: String by project
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    id("kotlin-android")
 }
 
 allprojects {
@@ -17,31 +17,27 @@ group = "com.victorblaess.native_flutter_proxy"
 
 android {
     namespace = "com.victorblaess.native_flutter_proxy"
-    ndkVersion = "26.3.11579264"
-    compileSdk = 35
+    ndkVersion = "27.3.13750724"
+    compileSdk = 36
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     sourceSets["main"].java.srcDirs("src/main/kotlin")
 
     defaultConfig {
-        minSdk = 16
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        minSdk = 23
     }
 
     lint {
         disable.add("InvalidPackage")
     }
 }
 
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }

android/gradle.properties

@@ -1,5 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-agpVersion=8.7.0
-kotlinVersion=1.8.22

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Thu Mar 27 10:21:41 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle.kts

@@ -1,16 +1,26 @@
 pluginManagement {
-    val agpVersion: String by settings
-    val kotlinVersion: String by settings
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
-        gradlePluginPortal()
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
-    plugins {
-        id("com.android.library") version agpVersion
-        id("org.jetbrains.kotlin.android") version kotlinVersion
-    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.library") version "8.13.2" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
 }
 
 rootProject.name = "native_flutter_proxy"

example/.gitignore

@@ -5,9 +5,12 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -24,15 +27,11 @@
 **/doc/api/
 **/ios/Flutter/.last_build_id
 .dart_tool/
-.flutter-plugins
 .flutter-plugins-dependencies
-.packages
 .pub-cache/
 .pub/
 /build/
-
-# Web related
-lib/generated_plugin_registrant.dart
+/coverage/
 
 # Symbolication related
 app.*.symbols