Merge pull request #1133 from cph-cachet/733-project-app_usage---orgjetbrainskotlinkotlin-gradle-plugin1350

 app_usage 4.0.0 published

Author: bardram

packages/app_usage/CHANGELOG.md

@@ -1,58 +1,63 @@
+## 4.0.0
+
+* upgrade of Android APK
+* removing `AppUsageException` - instead and empty list is returned on iOS
+
 ## 3.0.1
 
-- Updated pubsec.yaml description
-- Fixed license file
+* Updated `pubsec.yaml` description
+* Fixed license file
 
 ## 3.0.0
 
-- Updates Kotlin plugin and AGP
-- Upgrade of compileSdkVersion
-- Upgrade to Dart 3
+* Updates Kotlin plugin and AGP
+* Upgrade of compileSdkVersion
+* Upgrade to Dart 3
 
 ## 2.1.1
 
-- check of Android OS version added when getting `lastForeground`.
+* check of Android OS version added when getting `lastForeground`.
 
 ## 2.1.0
 
-- Addition of `lastForeground` information - when was the app last time in the foreground.
-- update of example app to AndroidX and new gradle build version.
-- update of documentation.
+* Addition of `lastForeground` information - when was the app last time in the foreground.
+* update of example app to AndroidX and new gradle build version.
+* update of documentation.
 
 ## 2.0.0
 
-- Migration to null safety
+* Migration to null safety
 
 ## 1.2.0
 
-- Fixed the parsing of package names and app names.
+* Fixed the parsing of package names and app names.
 
 ## 1.1.1
 
-- Updated example and README slightly to reflect the precision of the plugin.
+* Updated example and README slightly to reflect the precision of the plugin.
 
 ## 1.1.0
 
-- Changed the behaviour of the plugin to delay asking for permission when app usage is requested, rather than when the app is started.
+* Changed the behavior of the plugin to delay asking for permission when app usage is requested, rather than when the app is started.
 
 ## 1.0.2
 
-- Fixed an Android issue where the permission activity could not be spawned.
+* Fixed an Android issue where the permission activity could not be spawned.
 
 ## 1.0.1
 
-- Made the project anew since the old project had an error somewhere.
+* Made the project anew since the old project had an error somewhere.
 
 ## 1.0.0
 
-- Updated to the new Android API
-- Changed Android source code to Kotlin rather than Java
+* Updated to the new Android API
+* Changed Android source code to Kotlin rather than Java
 
 ## 0.9.0
 
-- Update example app to support Android X
-- Updated the README file to emphasize the need to use min SDK version 21 for Android
+* Update example app to support Android X
+* Updated the README file to emphasize the need to use min SDK version 21 for Android
 
 ## 0.0.1
 
-- Initial release
+* Initial release

packages/app_usage/LICENSE

@@ -1,17 +1,9 @@
 MIT License.
 
-Copyright 2019 Copenhagen Center for Health Technology (CACHET) at the Technical University of Denmark (DTU).
+Copyright 2018-2024 the Technical University of Denmark (DTU).
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-documentation files (the ”Software”), to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ”Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED ”AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED ”AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/app_usage/android/build.gradle

@@ -1,44 +1,68 @@
-group 'dk.cachet.app_usage'
-version '1.0-SNAPSHOT'
+group = "dk.cachet.app_usage"
+version = "1.0-SNAPSHOT"
 
 buildscript {
-ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = "1.8.22"
     repositories {
         google()
-mavenCentral()
+        mavenCentral()
     }
 
     dependencies {
-    classpath 'com.android.tools.build:gradle:7.3.0'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion 33
+    namespace "dk.cachet.app_usage"
+
+    compileSdk = 35
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11
+    }
 
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += "src/main/kotlin"
+        test.java.srcDirs += "src/test/kotlin"
     }
+
     defaultConfig {
-        minSdkVersion 16
+        minSdk = 21
     }
-    lintOptions {
-        disable 'InvalidPackage'
+
+    dependencies {
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("org.mockito:mockito-core:5.0.0")
     }
-    namespace "dk.cachet.app_usage"
-}
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
+    }
 }
+
+

packages/app_usage/android/gradle.properties

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[],"android":[{"name":"app_usage","path":"/Users/arata/Developer/carp/flutter-plugins/packages/app_usage/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"app_usage","dependencies":[]}],"date_created":"2024-10-30 13:38:21.146381","version":"3.24.3","swift_package_manager_enabled":false}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[],"android":[{"name":"app_usage","path":"/Users/bardram/dev/flutter-plugins/packages/app_usage/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"app_usage","dependencies":[]}],"date_created":"2025-02-11 15:03:37.052336","version":"3.27.1","swift_package_manager_enabled":false}

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

@@ -1,64 +1,44 @@
-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.app_usage_example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    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.app_usage_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 '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    source = "../.."
 }

packages/app_usage/example/.flutter-plugins-dependencies

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.app_usage_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

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

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.app_usage_example"
           xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission

packages/app_usage/example/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.app_usage_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->