Merge pull request #16 from cyface-de/release-3.0.0_DAT-762

Release 3.0.0 dat 762

.gitignore

@@ -16,3 +16,6 @@ local.properties
 
 # keystore file, when copied into this project for manual (test) deployment of "release" variant
 /release-upload-key.jks
+
+# Only version gradle.properties.template
+/gradle.properties

README.adoc

@@ -28,11 +28,11 @@ To download the Cyface libraries (SDK, Energy Settings, Camera Service):
 [arabic]
 * You need a Github account with read-access to these Github repositories
 * Create a https://github.com/settings/tokens[personal access token on Github] with "write:packages" permissions
-* Create or adjust a `local.properties` file in the project root containing:
+* Copy `gradle.properties.template` to `gradle.properties` and adjust:
 +
 ....
-github.user=YOUR_USERNAME
-github.token=YOUR_ACCESS_TOKEN
+githubUser=YOUR_USERNAME
+githubToken=YOUR_ACCESS_TOKEN
 ....
 * Build the app `./gradlew build`
 
@@ -44,7 +44,8 @@ The credentials are usually injected by the CI:
 
 ==== Sentry
 
-Create a file `sentry.properties` with the following credentials:
+Create a file `sentry.properties` with the following credentials,
+the `auth.token` can be found on `Sentry > Settings > Account > API > Auth Tokens`.
 
 ....
 defaults.project=android-app
@@ -54,14 +55,14 @@ auth.token=SECRET_TOKEN
 
 ==== Google Maps
 
-Add the following to your `local.properties` file:
+Add the following to your `gradle.properties` file:
 ....
 google.maps_api_key=SECRET_KEY
 ....
 
 ==== Cyface Guest Credentials
 
-Add the following to your `local.properties` file:
+Add the following to your `gradle.properties` file:
 ....
 cyface.guest_password=GUEST_PASSWORD
 ....
@@ -124,14 +125,13 @@ $ git push
 See https://github.com/cyface-de/android-backend#release-a-new-version[Cyface Android SDK Readme]
 
 * `versionCode` is automatically incremented by the CI
-* After pushing the release tag to Github out CI builds the Android Bundle now automatically
+* After pushing the release tag to Github the CI builds the Android Bundle now automatically
 * Checkout this build, copy the bundle from the artifacts and upload it to Play Store
-* Manually mark the released version as 'new Release' on https://github.com/cyface-de/android-app/releases[Github].
 
 
 [[license]]
 == License
-Copyright 2017-2021 Cyface GmbH
+Copyright 2017-2022 Cyface GmbH
 
 This file is part of the Cyface App for Android.
 

bluetooth-le/build.gradle

@@ -21,7 +21,7 @@
  *
  * @author Armin Schnabel
  * @author Klemens Muthmann
- * @version 1.0.3
+ * @version 1.0.4
  * @since 1.0.0
  */
 apply plugin: 'com.android.library'
@@ -37,7 +37,13 @@ android {
         testInstrumentationRunner rootProject.ext.testInstrumentationRunner
     }
 
-    lintOptions {
+    // Enabling desugaring to support Java 8 and Java 11 features
+    compileOptions {
+        sourceCompatibility rootProject.ext.sourceCompatibility
+        targetCompatibility rootProject.ext.targetCompatibility
+    }
+
+    lint {
         abortOnError false
     }
 

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Cyface GmbH
+ * Copyright 2017-2022 Cyface GmbH
  *
  * This file is part of the Cyface App for Android.
  *
@@ -21,30 +21,32 @@
  *
  * @author Armin Schnabel
  * @author Klemens Muthmann
- * @version 2.1.0
+ * @version 2.1.1
  * @since 1.0.0
  */
 
 buildscript {
-    ext.kotlin_version = "1.4.21"
-    ext.java_version = JavaVersion.VERSION_1_8
+    ext.gradle_version = '7.1.2'
+    ext.kotlin_version = "1.6.10"
+    ext.matcher_version = "1.2.2"
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath "com.android.tools.build:gradle:$gradle_version"
         // Required for versioning Google play services.
-        classpath "com.google.android.gms:strict-version-matcher-plugin:1.2.2"
+        classpath "com.google.android.gms:strict-version-matcher-plugin:$matcher_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 ext {
-    // This app
+    // This app's version
     applicationId = "de.cyface.app"
-    versionName = "2.15.0" // Version shown to the user. Only increase this on the release branch.
+    versionName = "3.0.0" // Version shown to the user
     versionCode = 1 // Automatically incremented by CI. Required for Play Store releases
 
     /*
@@ -53,69 +55,72 @@ ext {
      * prevents you from the creation of an incompatible fork and enables us to work standalone on the submodules.
      */
 
-    cyfaceBackendVersion = "6.2.0" // Also update submodule commit ref
-    cyfaceUtilsVersion = "2.0.1" // Maven dependency
-    cyfaceEnergySettingsVersion = "3.0.0" // Also update submodule commit ref
-    cyfaceCameraServiceVersion = "3.0.0" // Also update submodule commit ref
+    // Cyface dependencies
+    cyfaceAndroidBackendVersion = "7.1.0" // Also update submodule commit ref
+    cyfaceUtilsVersion = "3.2.2" // Maven dependency
+    cyfaceEnergySettingsVersion = "3.1.1" // Also update submodule commit ref
+    cyfaceCameraServiceVersion = "4.0.0" // Also update submodule commit ref
+    cyfaceSerializationVersion = "1.0.2" // Keep im sync with version in submodule `backend`
 
+    // Android SDK versions
     minSdkVersion = 21
     targetSdkVersion = 30
     compileSdkVersion = 30
     buildToolsVersion = '30.0.3'
 
+    // Android dependencies
     multidexVersion = "2.0.1"
-    androidxAnnotationVersion = "1.0.0"
-    androidxAppCompatVersion = "1.2.0"
+    androidxAnnotationVersion = "1.3.0"
+    androidxAppCompatVersion = "1.3.1" // 1.4.0 leads to an error in `gradle verifyReleaseResources`
     androidPreferencesVersion = "1.1.1"
     localbroadcastmanagerVersion = "1.0.0"
     exifinterfaceVersion = "1.3.2" // Required by Camera Service submodule
 
-    kotlinCoreVersion = "1.3.2"
+    // Other dependencies
+    kotlinCoreVersion = "1.6.0" // 1.7.0 leads to an error in `gradle verifyReleaseResources`
     materialDialogsVersion = "3.1.1"
+    googleApiClientVersion = '1.31.5' // transmission protocol
 
-    // testing
-    junitVersion = "1.1.2"
+    // Testing
+    junitVersion = "1.1.3"
     mockitoVersion = "3.3.3"
     hamcrestVersion = "1.3"
-    rulesVersion = "1.3.0"
-    robolectricVersion = "4.3.1"
+    rulesVersion = "1.4.0"
+    robolectricVersion = "4.6.1"
     androidxTestCoreVersion = "1.1.0"
-    runnerVersion = "1.3.0"
+    runnerVersion = "1.4.0"
     uiAutomatorVersion = "2.2.0"
     constrantLayoutVersion = "1.3.2"
-
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-    // android-frontend dependencies
-    sentryAndroidVersion = "3.1.1"
-    sentryAndroidGradlePluginVersion = "1.7.36"
-    mapPlayServicesVersion = "17.0.0"
-    locationPlayServicesVersion = "17.1.0"
-    materialVersion = "1.3.0-rc01" // Beta because we need version >= 1.2.0 for the slider
+    // Java version
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    kotlinTargetJavaVersion = "11"
+
+    // Android-frontend
+    sentryAndroidVersion = "5.0.1"
+    sentryAndroidGradlePluginVersion = "2.0.1"
+    mapPlayServicesVersion = "18.0.1"
+    locationPlayServicesVersion = "19.0.0"
+    materialVersion = "1.4.0"
     circelProgressVersion = "1.1.0" // Version > 1.1.0 (1.2.1) is currently not available
-    androidxRecyclerViewVersion = "1.1.0"
-
+    androidxRecyclerViewVersion = "1.2.1"
 }
 
 // Attention: Overwrites also the repositories used to retrieve the transitive dependencies in the submodules
 allprojects {
 
-    // Load credentials
-    def properties = new Properties()
-    properties.load(new FileInputStream("local.properties"))
-
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        gradlePluginPortal()
         // Required by submodules: camera_service, energy_settings, measuring-client, backend
         maven {
             url "https://maven.pkg.github.com/cyface-de/android-utils"
             credentials {
-                username = properties.getProperty("github.user")
-                password = properties.getProperty("github.token")
+                username = project.findProperty("githubUser")
+                password = project.findProperty("githubToken")
             }
         }
     }

gradle.properties.template

@@ -0,0 +1,17 @@
+org.gradle.jvmargs=-Xmx2049M
+android.builder.sdkDownload=true
+android.useAndroidX=true
+android.enableJetifier=true
+
+githubUser=
+githubToken=
+
+google.maps_api_key=
+
+cyface.demo_api=
+cyface.local_api=
+cyface.emulator_api=
+
+cyface.staging_api=
+cyface.staging_user=
+cyface.staging_password=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jan 19 12:39:03 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"