Bump dependencies

RADAR-base · Jan 23, 2023 · 1635556 · 1635556
1 parent d1e25bc
commit 1635556
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -10,26 +10,26 @@ Plugins that are implemented as part of RADAR-base are included in the `plugins`
 
 This library takes the following firebase parameters:
 
-| Parameter | Type | Default | Description |
-| --------- | ---- | ------- | ----------- |
-| `kafka_rest_proxy_url` | URL | `<empty>` | URL of a Kafka REST Proxy or RADAR-Gateway to send data to. |
-| `schema_registry_url` | URL | `<empty>` | URL of a Kafka Schema Registry to sync schemas with. |
-| `management_portal_url` | URL | `<empty>` | URL of the RADAR Management Portal. If empty, the Management Portal will not be used. |
-| `unsafe_kafka_connection` | boolean | `false` | Whether to accept unsafe HTTPS certificates. Only meant to be set to `true` in development environments. |
-| `plugins` | string | `<empty>` | A space-separated list of source providers to connect. |
-| `kafka_records_send_limit` | int | 1000 | Number of records to send in a single request. |
-| `kafka_records_size_limit` | int (bytes) | 5000000 (= 5 MB)| Maximum size to read for a single request. |
-| `kafka_upload_rate` | int (s) | 50 | Rate after which to send data. In addition, after every `kafka_upload_rate` divided by 5 seconds, if more than `kafka_records_send_limit` are in the buffer, these are sent immediately. |
-| `database_commit_rate` | int (ms) | 10000 (= 10 seconds) | Rate of committing new data to disk. If the application crashes, at most this interval of data will be lost. |
-| `sender_connection_timeout` | int (s) | 120 | HTTP timeout setting for data uploading. |
-| `kafka_upload_minimum_battery_level` | int (s) | 0.1 (= 10%) | Battery level percentage below which to stop sending data. Data will still be collected. |
-| `max_cache_size_bytes` | long (byte) | 450000000 | Maximum number of bytes per topic to store. |
-| `send_only_with_wifi` | boolean | `true` | Whether to send only when WiFi is connected. If false, for example LTE would also be used. |
-| `send_over_data_high_priority_only` | boolean | `true` | Only the data of high priority topics will be sent over LTE. Only used if `send_only_with_wifi` is set to `true`. High priority topics are determined by the `topics_high_priority` property. |
-| `topics_high_priority` | string | `<empty>` | A comma separated list of topics that should be considered high priority. |
-| `send_with_compression` | boolean | `true` | Send data with GZIP compression. This requires RADAR-Gateway to be installed in front of the Kafka REST Proxy. |
-| `firebase_fetch_timeout_ms` | long (ms) | 43200000 (= 12 hours) | Interval for fetching new Firebase configuration if the app is not active. |
-| `send_binary_data` | boolean | `true` | Send data using a binary protocol. If the server does not support it, the app will fall back to regular JSON protocol. |
+| Parameter                            | Type        | Default               | Description                                                                                                                                                                                   |
+|--------------------------------------|-------------|-----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `kafka_rest_proxy_url`               | URL         | `<empty>`             | URL of a Kafka REST Proxy or RADAR-Gateway to send data to.                                                                                                                                   |
+| `schema_registry_url`                | URL         | `<empty>`             | URL of a Kafka Schema Registry to sync schemas with.                                                                                                                                          |
+| `management_portal_url`              | URL         | `<empty>`             | URL of the RADAR Management Portal. If empty, the Management Portal will not be used.                                                                                                         |
+| `unsafe_kafka_connection`            | boolean     | `false`               | Whether to accept unsafe HTTPS certificates. Only meant to be set to `true` in development environments.                                                                                      |
+| `plugins`                            | string      | `<empty>`             | A space-separated list of source providers to connect.                                                                                                                                        |
+| `kafka_records_send_limit`           | int         | 1000                  | Number of records to send in a single request.                                                                                                                                                |
+| `kafka_records_size_limit`           | int (bytes) | 5000000 (= 5 MB)      | Maximum size to read for a single request.                                                                                                                                                    |
+| `kafka_upload_rate`                  | int (s)     | 50                    | Rate after which to send data. In addition, after every `kafka_upload_rate` divided by 5 seconds, if more than `kafka_records_send_limit` are in the buffer, these are sent immediately.      |
+| `database_commit_rate`               | int (ms)    | 10000 (= 10 seconds)  | Rate of committing new data to disk. If the application crashes, at most this interval of data will be lost.                                                                                  |
+| `sender_connection_timeout`          | int (s)     | 120                   | HTTP timeout setting for data uploading.                                                                                                                                                      |
+| `kafka_upload_minimum_battery_level` | int (s)     | 0.1 (= 10%)           | Battery level percentage below which to stop sending data. Data will still be collected.                                                                                                      |
+| `max_cache_size_bytes`               | long (byte) | 450000000             | Maximum number of bytes per topic to store.                                                                                                                                                   |
+| `send_only_with_wifi`                | boolean     | `true`                | Whether to send only when WiFi is connected. If false, for example LTE would also be used.                                                                                                    |
+| `send_over_data_high_priority_only`  | boolean     | `true`                | Only the data of high priority topics will be sent over LTE. Only used if `send_only_with_wifi` is set to `true`. High priority topics are determined by the `topics_high_priority` property. |
+| `topics_high_priority`               | string      | `<empty>`             | A comma separated list of topics that should be considered high priority.                                                                                                                     |
+| `send_with_compression`              | boolean     | `true`                | Send data with GZIP compression. This requires RADAR-Gateway to be installed in front of the Kafka REST Proxy.                                                                                |
+| `firebase_fetch_timeout_ms`          | long (ms)   | 43200000 (= 12 hours) | Interval for fetching new Firebase configuration if the app is not active.                                                                                                                    |
+| `send_binary_data`                   | boolean     | `true`                | Send data using a binary protocol. If the server does not support it, the app will fall back to regular JSON protocol.                                                                        |
 
 ## Usage
 

diff --git a/build.gradle b/build.gradle
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '1.8.0'
     ext.dokka_version = '1.7.20'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.bjoernq:unmockplugin:0.7.9'
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
@@ -31,7 +31,7 @@ buildscript {
 
 plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-    id("com.github.ben-manes.versions") version "0.42.0"
+    id("com.github.ben-manes.versions") version "0.44.0"
 }
 
 allprojects {
@@ -119,5 +119,5 @@ nexusPublishing {
 }
 
 wrapper {
-    gradleVersion '7.5.1'
+    gradleVersion '7.6'
 }
diff --git a/gradle/test.gradle b/gradle/test.gradle
@@ -9,23 +9,23 @@ android {
 }
 
 ext {
-    androidXCoreVersion = '1.4.0'
-    androidXExtTruthVersion = '1.4.0'
-    androidXExtJunitVersion = '1.1.3'
-    androidXRunnerVersion = '1.4.0'
-    androidXEspressoVersion = '3.4.0'
+    androidXCoreVersion = '1.5.0'
+    androidXExtTruthVersion = '1.5.0'
+    androidXExtJunitVersion = '1.1.5'
+    androidXRunnerVersion = '1.5.0'
+    androidXEspressoVersion = '3.5.1'
 }
 
 dependencies {
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.slf4j:slf4j-simple:2.0.3'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.6'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
 
     // Core library
     androidTestImplementation "androidx.test:core:$androidXCoreVersion"
 
     // AndroidJUnitRunner and JUnit Rules
-    androidTestImplementation "androidx.test:runner:$androidXRunnerVersion"
+    androidTestImplementation "androidx.test:runner:1.5.2"
     androidTestImplementation "androidx.test:rules:$androidXRunnerVersion"
 
     // Assertions

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

diff --git a/plugins/radar-android-faros/build.gradle b/plugins/radar-android-faros/build.gradle
@@ -1,5 +1,9 @@
 apply from: "$rootDir/gradle/android.gradle"
 
+android {
+    namespace 'org.radarbase.passive.bittium'
+}
+
 //---------------------------------------------------------------------------//
 // Configuration                                                             //
 //---------------------------------------------------------------------------//

diff --git a/plugins/radar-android-faros/src/main/AndroidManifest.xml b/plugins/radar-android-faros/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.radarbase.passive.bittium" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 

diff --git a/plugins/radar-android-login-qr/build.gradle b/plugins/radar-android-login-qr/build.gradle
@@ -15,7 +15,7 @@ description = 'RADAR Android QR LoginManager.'
 dependencies {
     api project(':radar-commons-android')
     implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
     // Support Android 14+
     //noinspection GradleDependency
     implementation 'com.google.zxing:core:3.4.0'

diff --git a/plugins/radar-android-ppg/build.gradle b/plugins/radar-android-ppg/build.gradle
@@ -16,7 +16,7 @@ description = 'Plugin for RADAR passive remote monitoring app for measuring PPG
 
 dependencies {
     api project(':radar-commons-android')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

diff --git a/radar-commons-android/build.gradle b/radar-commons-android/build.gradle
@@ -38,19 +38,19 @@ dependencies {
     }
     api(project(':avro-android'))
     api("org.slf4j:slf4j-api:2.0.6")
-    api("androidx.appcompat:appcompat:1.5.1")
+    api("androidx.appcompat:appcompat:1.6.0")
 
     implementation "com.squareup.okhttp3:okhttp:4.10.0"
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
 
     api "androidx.lifecycle:lifecycle-service:2.5.1"
 
-    implementation platform('com.google.firebase:firebase-bom:30.5.0')
+    implementation platform('com.google.firebase:firebase-bom:31.2.0')
+    implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-config'
-    implementation 'com.google.firebase:firebase-core'
     implementation 'com.google.firebase:firebase-crashlytics'
-    implementation 'com.gitlab.mvysny.slf4j:slf4j-handroid:2.0.0'
+    implementation 'com.gitlab.mvysny.slf4j:slf4j-handroid:2.0.4'
 }
 
 apply from: "$rootDir/gradle/test.gradle"