Release 7.5.0

.github/workflows/ci.yml

@@ -1,11 +1,13 @@
 name: CI
 
 on: [pull_request]
+
 env:
   DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
   FLUTTER_VERSION: 3.0.2
-  JAVA_VERSION: "12.x"
+  JAVA_VERSION: "17.x"
   JAVA_DISTRIBUTION: 'zulu'
+  ANDROID_SDK_ROOT: ${{ github.workspace }}/android-sdk
 
 jobs:
   ci:

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 env:
   DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
   FLUTTER_VERSION: 3.0.2
-  JAVA_VERSION: "12.x"
+  JAVA_VERSION: "17.x"
   JAVA_DISTRIBUTION: 'zulu'
 
 jobs:

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Flutter Plugin Changelog
 
+## Version 7.5.0 - June 20, 2024
+Minor release that updates iOS SDK to 18.4.0, updates Android compileSDKVersion from 33 to 34, sets Android source and target compatibility to Java 17, updates android example build configuration, improves example UI, and updates the airship mobile framework proxy to 6.3.0 which includes a fix for event management.
+
+### Changes
+- Updated iOS SDK to 18.4.0
+- Updated airship-mobile-framework-proxy to 6.3.0
+- Fixed Event Emitter bug
+- Updated Android compileSDKVersion from 33 to 34 and set source and target compatibility to Java 17
+- Updated Android example build configration
+- Improved example UI
+
 ## Version 7.4.0 - May 16, 2024
 Minor release that updates the Android SDK to 17.8.1 and iOS SDK to 18.2.2
 

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     ext.coroutine_version = '1.5.2'
     ext.datastore_preferences_version = '1.0.0'
     ext.airship_version = '17.8.1'
-    ext.airship_framework_proxy_version = '6.2.2'
+    ext.airship_framework_proxy_version = '6.3.0'
 
     repositories {
         google()
@@ -55,6 +55,7 @@ android {
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        jvmTarget = "17"
     }
 }
 

android/src/main/kotlin/com/airship/flutter/AirshipPluginVersion.kt

@@ -2,6 +2,6 @@ package com.airship.flutter
 
 class AirshipPluginVersion {
     companion object {
-        const val AIRSHIP_PLUGIN_VERSION = "7.4.0"
+        const val AIRSHIP_PLUGIN_VERSION = "7.5.0"
     }
 }

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/lib/main.dart

@@ -161,54 +161,74 @@ class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin {
       debugShowCheckedModeBanner: false,
       navigatorKey: key,
       title: "Airship Sample App",
+      theme: ThemeData(
+        primaryColor: Styles.borders,
+        colorScheme: ColorScheme.fromSwatch().copyWith(
+          secondary: Styles.airshipBlue, // Set the accent color to airshipBlue
+        ),
+        switchTheme: SwitchThemeData(
+          trackColor:
+              MaterialStateProperty.all(Styles.airshipBlue), // Set track color
+        ),
+      ),
       initialRoute: "/",
       routes: {
         '/': (context) => tabBarView(),
       },
     );
   }
 
-  Widget tabBarView() {
-    return WillPopScope(
-        onWillPop: null,
-        child: Scaffold(
-          body: TabBarView(
-            children: <Widget>[
-              Home(),
-              MessageCenter(),
-              PreferenceCenter(),
-              Settings()
-            ],
-            controller: controller,
+  Widget bottomNavigationBar() {
+    return Container(
+      color: Styles.borders, // Set the same color as the tab bar
+      child: SafeArea(
+        bottom: true,
+        child: Material(
+          color: Colors.transparent,
+          child: Container(
+            color: Styles.borders,
+            child: TabBar(
+              indicatorColor: Styles.airshipRed,
+              unselectedLabelColor: Colors.grey, // Set unselected label color
+              labelColor:
+                  Styles.airshipBlue, // Set selected label color to airshipBlue
+              tabs: <Tab>[
+                Tab(
+                  icon: Icon(Icons.home),
+                ),
+                Tab(
+                  icon: Icon(Icons.inbox),
+                ),
+                Tab(
+                  icon: Icon(Icons.menu),
+                ),
+                Tab(
+                  icon: Icon(Icons.settings),
+                ),
+              ],
+              controller: controller,
+            ),
           ),
-          bottomNavigationBar: bottomNavigationBar(),
-        ));
+        ),
+      ),
+    );
   }
 
-  Widget bottomNavigationBar() {
-    return Material(
-      // set the color of the bottom navigation bar
-      color: Styles.borders,
-      // set the tab bar as the child of bottom navigation bar
-      child: TabBar(
-        indicatorColor: Styles.airshipRed,
-        tabs: <Tab>[
-          Tab(
-            // set icon to the tab
-            icon: Icon(Icons.home),
-          ),
-          Tab(
-            icon: Icon(Icons.inbox),
-          ),
-          Tab(
-            icon: Icon(Icons.menu),
-          ),
-          Tab(
-            icon: Icon(Icons.settings),
-          ),
-        ],
-        // setup the controller
-        controller: controller,
+  Widget tabBarView() {
+    return WillPopScope(
+      onWillPop: null,
+      child: Scaffold(
+        backgroundColor: Styles.borders,
+        body: TabBarView(
+          children: <Widget>[
+            Home(),
+            MessageCenter(),
+            PreferenceCenter(),
+            Settings()
+          ],
+          controller: controller,
+        ),
+        bottomNavigationBar: bottomNavigationBar(),
       ),
     );
   }

ios/Classes/AirshipPluginVersion.swift

@@ -1,5 +1,5 @@
 import Foundation
 
 class AirshipPluginVersion {
-    static let pluginVersion = "7.4.0"
+    static let pluginVersion = "7.5.0"
 }

ios/airship_flutter.podspec

@@ -1,5 +1,5 @@
 
-AIRSHIP_FLUTTER_VERSION="7.4.0"
+AIRSHIP_FLUTTER_VERSION="7.5.0"
 
 #
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
@@ -20,6 +20,6 @@ Airship flutter plugin.
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.ios.deployment_target      = "14.0"
-  s.dependency "AirshipFrameworkProxy", "6.2.2"
+  s.dependency "AirshipFrameworkProxy", "6.3.0"
 end
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: airship_flutter
 description: "Cross-platform plugin interface for the native Airship iOS and Android SDKs. Simplifies adding Airship to Flutter apps."
-version: 7.4.0
+version: 7.5.0
 homepage: https://www.airship.com/
 repository: https://github.com/urbanairship/airship-flutter
 issue_tracker: https://github.com/urbanairship/airship-flutter/issues

scripts/run_ci_tasks.sh

@@ -47,8 +47,6 @@ fi
 # Android
 if $ANDROID ; then
     cd example
-    # Set the Ndk dir path
-    echo "ndk.dir=/Users/runner/Library/Android/sdk/ndk-bundle" > ./android/local.properties
     # Build sample using flutter tool
     flutter build apk --release
     cd ..