Merge branch 'cph-cachet:master' into master

Author: LorenzSchueler

README.md

@@ -27,7 +27,7 @@ These are the available plugins in this repository.
 | [audio_streamer](./packages/audio_streamer) | Stream audio as PCM from mic| ✔️ | ✔️  | [![pub package](https://img.shields.io/pub/v/audio_streamer.svg)](https://pub.dartlang.org/packages/audio_streamer) |
 | [mobility_features](./packages/mobility_features) | Compute daily mobility features from location data | ✔️ | ✔️  | [![pub package](https://img.shields.io/pub/v/mobility_features.svg)](https://pub.dartlang.org/packages/mobility_features) |
 | [carp_background_location](./packages/carp_background_location) | Track location, even when app is in the background | ✔️ | ✔️  | [![pub package](https://img.shields.io/pub/v/carp_background_location.svg)](https://pub.dartlang.org/packages/carp_background_location) |
-| [flutter_foreground_service](./packages/flutter_foreground_service) | Foreground service for Android | ✔️ | ✔️  | [![pub package](https://img.shields.io/pub/v/flutter_foreground_service.svg)](https://pub.dartlang.org/packages/flutter_foreground_service) |
+| [flutter_foreground_service](./packages/flutter_foreground_service) | Foreground service for Android | ✔️ | ❌  | [![pub package](https://img.shields.io/pub/v/flutter_foreground_service.svg)](https://pub.dartlang.org/packages/flutter_foreground_service) |
 
 ## Issues
 

packages/activity_recognition_flutter/CHANGELOG.md

@@ -1,31 +1,45 @@
+## 5.0.0
+
+- upgraded Android SDK level
+- upgraded flutter version
+- upgraded AGP
+
 ## 4.2.0
-* small refactor and improvement of docs
-* using `ActivityRecognition()` when creating a singleton -- standard practice in Dart.
+
+- small refactor and improvement of docs
+- using `ActivityRecognition()` when creating a singleton -- standard practice in Dart.
 
 ## 4.1.0
-* [PR #474](https://github.com/cph-cachet/flutter-plugins/pull/474) - Android 12 intent-flag
-* the name of the stream has been changed from `startStream` to `activityStream`
-* cleanup in example app
+
+- [PR #474](https://github.com/cph-cachet/flutter-plugins/pull/474) - Android 12 intent-flag
+- the name of the stream has been changed from `startStream` to `activityStream`
+- cleanup in example app
 
 ## 4.0.5+1
-* [PR #408](https://github.com/cph-cachet/flutter-plugins/pull/408)
+
+- [PR #408](https://github.com/cph-cachet/flutter-plugins/pull/408)
 
 ## 4.0.4
-* improvements to documentation
+
+- improvements to documentation
 
 ## 4.0.3
-* [PR #358](https://github.com/cph-cachet/flutter-plugins/pull/358)
+
+- [PR #358](https://github.com/cph-cachet/flutter-plugins/pull/358)
 
 ## 4.0.2
-* [PR #302](https://github.com/cph-cachet/flutter-plugins/pull/302)
-* [PR #351](https://github.com/cph-cachet/flutter-plugins/pull/351)
+
+- [PR #302](https://github.com/cph-cachet/flutter-plugins/pull/302)
+- [PR #351](https://github.com/cph-cachet/flutter-plugins/pull/351)
 
 ## 4.0.1
-* Fix of issue #309, i.e. a null pointer that occurs when running the plugin on API 30.
-* Replaced the deprecated `IntentService` with a `JobIntentService`. 
-* [PR #314](https://github.com/cph-cachet/flutter-plugins/pull/314)
+
+- Fix of issue #309, i.e. a null pointer that occurs when running the plugin on API 30.
+- Replaced the deprecated `IntentService` with a `JobIntentService`.
+- [PR #314](https://github.com/cph-cachet/flutter-plugins/pull/314)
 
 ## 4.0.0
+
 - Null safety migration
 - Updated swift code
 

packages/activity_recognition_flutter/android/build.gradle

@@ -4,32 +4,33 @@ version '1.0'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 21
+      minSdkVersion 26
     }
     lintOptions {
         disable 'InvalidPackage'
     }
+    namespace "dk.cachet.activity_recognition_flutter"
 }
 
 dependencies {

packages/activity_recognition_flutter/android/gradle/wrapper/gradle-wrapper.properties

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

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

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion flutter.compileSdkVersion
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,8 +34,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dk.cachet.activity_recognition_flutter_example"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

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

@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:label="activity_recognition_flutter_example">
         <activity
@@ -15,7 +15,8 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

packages/activity_recognition_flutter/example/android/build.gradle

@@ -1,18 +1,18 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+    classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

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

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

packages/activity_recognition_flutter/example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

packages/activity_recognition_flutter/example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'