Merge pull request #1136 from cph-cachet/apk-package-upgrade

APK package upgrade

Author: bardram

packages/esense_flutter/CHANGELOG.md

@@ -1,80 +1,84 @@
+## 1.1.1
+
+* upgrade to Android APK
+
 ## 1.0.0
 
-- first stable release
-- update to Bluetooth permissions in demo app
-- improved handling of disconnection
+* first stable release
+* update to Bluetooth permissions in demo app
+* improved handling of disconnection
 
 ## 0.7.0
 
-- Upgrade of Kotlin and AGP
-- Dart fix
+* Upgrade of Kotlin and AGP
+* Dart fix
 
 ## 0.6.2
 
-- Added podspec file to iOS
+* Added podspec file to iOS
 
 ## 0.6.1
 
-- fixed bug in sampling rate configuration on Android
-- small improvement to API doc and example app
+* fixed bug in sampling rate configuration on Android
+* small improvement to API doc and example app
 
 ## 0.6.0
 
-- moved permission handling to app level
-- improved on iOS implementation
-- improvement to example app
-- improvement to README
+* moved permission handling to app level
+* improved on iOS implementation
+* improvement to example app
+* improvement to README
 
 ## 0.5.0
 
-- upgrade to Android embedding v2
+* upgrade to Android embedding v2
 
 ## 0.4.3
 
-- fix of error in setSamplingRate method on iOS
+* fix of error in setSamplingRate method on iOS
 
 ## 0.4.0
 
-- upgrade to null-safety
+* upgrade to null-safety
 
 ## 0.3.0
 
-- singleton changed to recommended dart style using `ESenseManager()`.
-- fixed bug in reconnection.
-- updated the Android app to [post 1.12 Android project](https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects).
-- small improvement to the demo app (now supports connection via a button).
+* singleton changed to recommended dart style using `ESenseManager()`.
+* fixed bug in reconnection.
+* updated the Android app to [post 1.12 Android project](https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects).
+* small improvement to the demo app (now supports connection via a button).
 
 ## 0.2.1
 
-- updated Swift implementation to version 5
+* updated Swift implementation to version 5
 
 ## 0.2.0+2
 
-- update to readme on iOS
-- added bluetooth permission to `Info.plist`
+* update to readme on iOS
+* added bluetooth permission to `Info.plist`
 
 ## 0.2.0+1
 
-- small update to documentation
+* small update to documentation
 
 ## 0.2.0
 
-- support for iOS implemented
-- improved example app
-- improvement to documentation
+* support for iOS implemented
+* improved example app
+* improvement to documentation
 
 ## 0.1.3
 
-- sampling rate can be set before connecting to device.
+* sampling rate can be set before connecting to device.
 
 ## 0.1.2
 
-- small improvement to the example app (still not very good though...)
+* small improvement to the example app (still not very good though...)
 
 ## 0.1.1+1
 
-- update of readme documentation on API.
+* update of readme documentation on API.
 
 ## 0.1.0
 
-- Initial release supporting 1st released version of the Android eSense library, dated April 2019.
+* Initial release supporting 1st released version of the Android eSense library, dated April 2019.

packages/esense_flutter/android/build.gradle

@@ -1,36 +1,68 @@
-group 'dk.cachet.esense_flutter'
-version '1.0'
+group = "k.cachet.esense_flutter"
+version = "1.0-SNAPSHOT"
 
 buildscript {
+    ext.kotlin_version = "1.8.22"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion 31
+    namespace "dk.cachet.esense_flutter"
+
+    compileSdk = 31
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        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 {
-        minSdkVersion 16
+        minSdk = 21
+    }
+
+    dependencies {
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("org.mockito:mockito-core:5.0.0")
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
     }
-    namespace "dk.cachet.esense_flutter"
 }
+
+

packages/esense_flutter/example/android/app/build.gradle

@@ -1,56 +1,45 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    namespace = "dk.cachet.esense_flutter_example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dk.cachet.esense_flutter_example"
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
+

packages/esense_flutter/example/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.esense_flutter_example"
     xmlns:tools="http://schemas.android.com/tools">
 
     <!-- The following permission is related to the eSense library -->
@@ -51,4 +50,15 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
 </manifest>

packages/esense_flutter/example/android/build.gradle

@@ -1,29 +1,16 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

packages/esense_flutter/example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

packages/esense_flutter/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

packages/esense_flutter/example/android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

packages/esense_flutter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: esense_flutter
 description: The eSense Flutter Plugin supporting the eSense earable computing devices from Nokia Bell Labs, Cambridge.
-version: 1.0.0
+version: 1.1.1
 homepage: https://github.com/cph-cachet/flutter-plugins/tree/master/packages/esense_flutter
 
 environment: