Merge pull request #883 from enviroCar/develop

Release Version 2.1.0
enviroCar · Jan 22, 2022 · 1aee69d · 1aee69d
2 parents 98403d7 + 6198bfa
commit 1aee69d
Show file tree

Hide file tree

Showing 62 changed files with 740 additions and 168 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,5 @@
+build
+.idea
+.gradle
+local.properties
+Dockerfile.build
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 8
+    - name: set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
         cache: gradle
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 8
+    - name: set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
         cache: gradle
 

diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ build/
 *.iml
 local.properties
 */release/
+gradle-release.properties
+lcs-keystore
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -0,0 +1,31 @@
+FROM mingc/android-build-box:1.24.0
+
+ARG ORG_GRADLE_PROJECT_MAPBOX_DOWNLOADS_TOKEN
+
+RUN mkdir /app
+WORKDIR /app
+
+# rm the NDK because it breaks the build
+RUN rm -rf /opt/android-sdk/ndk/current
+RUN rm -rf /opt/android-sdk/ndk/23.1.7779620
+
+COPY ./gradle /app/gradle
+COPY ./gradlew /app
+COPY ./gradle.properties /app
+COPY ./settings.gradle /app
+COPY ./build.gradle /app
+
+# add a step that downloads the latest gradle wrapper before the actual build
+#RUN ./gradlew help
+
+COPY . /app
+
+
+RUN ./gradlew build
+
+# build the image with:
+# docker build --build-arg ORG_GRADLE_PROJECT_MAPBOX_DOWNLOADS_TOKEN=<mapbox-api-token> -t envirocar-app-build:latest -f Dockerfile.build .
+#
+# to copy the final APK from the image to the host path /tmp/envirocar:
+# docker run --rm -v /tmp/envirocar:/mnt/out envirocar-app-build:latest cp /app/org.envirocar.app/build/outputs/apk/debug/org.envirocar.app-debug.apk /mnt/out
+
diff --git a/Dockerfile.release b/Dockerfile.release
@@ -0,0 +1,41 @@
+FROM mingc/android-build-box:1.24.0
+
+ARG ORG_GRADLE_PROJECT_RELEASE_STORE_FILE
+ARG ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD
+ARG ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS
+ARG ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD
+ARG ORG_GRADLE_PROJECT_MAPBOX_DOWNLOADS_TOKEN
+
+RUN mkdir /app
+WORKDIR /app
+
+# rm the NDK because it breaks the build
+RUN rm -rf /opt/android-sdk/ndk/current
+RUN rm -rf /opt/android-sdk/ndk/23.1.7779620
+
+COPY ./gradle /app/gradle
+COPY ./gradlew /app
+COPY ./gradle.properties /app
+COPY ./settings.gradle /app
+COPY ./build.gradle /app
+COPY ./lcs-keystore /app/lcs-keystore
+
+# add a step that downloads the latest gradle wrapper before the actual build
+#RUN ./gradlew help
+
+COPY . /app
+# use the following as --build-arg variables:
+# ORG_GRADLE_PROJECT_RELEASE_STORE_FILE=/app/lcs-keystore
+# ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD=<pw>
+# ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS=<alias>
+# ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD=<pw>
+
+
+RUN ./gradlew assembleRelease
+
+# build the image with:
+# docker build --build-arg ORG_GRADLE_PROJECT_RELEASE_STORE_FILE=/app/lcs-keystore --build-arg ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD=<pw> --build-arg ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS=<alias> --build-arg ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD=<pw> --build-arg ORG_GRADLE_PROJECT_MAPBOX_DOWNLOADS_TOKEN=<mapbox-api-token> -t envirocar-app-release:latest -f Dockerfile.release .
+#
+# to copy the final APK from the image to the host path /tmp/envirocar:
+# docker run --rm -v /tmp/envirocar:/mnt/out envirocar-app-release:latest cp /app/org.envirocar.app/build/outputs/apk/release/org.envirocar.app-release.apk /mnt/out
+
diff --git a/android-obd-simulator/AndroidManifest.xml b/android-obd-simulator/AndroidManifest.xml
@@ -27,7 +27,8 @@
                  android:icon="@drawable/app_icon" >
         <activity android:name=".OBDSimulator"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden">
+                  android:configChanges="orientation|keyboardHidden"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/build.gradle b/build.gradle
@@ -2,23 +2,21 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-        jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://plugins.gradle.org/m2/" }
         google()
 
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.android.tools.build:gradle:7.0.3'
     }
 
 }
 
 plugins {
-    id "com.github.dcendents.android-maven" version "2.1"
-    id "com.github.hierynomus.license" version "0.15.0"
+    id 'maven-publish'
+    id "com.github.hierynomus.license" version "0.16.1"
 }
 
 allprojects {
@@ -38,19 +36,31 @@ allprojects {
         mavenLocal()
         maven { url "https://jitpack.io" }
         mavenCentral()
-        jcenter()
         google()
+        maven {
+            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                // Do not change the username below.
+                // This should always be `mapbox` (not your username).
+                username = "mapbox"
+                // Use the secret token you stored in gradle.properties as the password
+                password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+            }
+        }
     }
 }
 
 ext {
     androidPlugin = 'com.android.tools.build:gradle:3.1.2'
     minSdkVersion = 21
-    compileSdkVersion = 30
-    targetSdkVersion = 30
+    compileSdkVersion = 31
+    targetSdkVersion = 31
     buildToolsVersion = '30.0.2'
-    versionCode = 50
-    versionName = "2.0.0"
+    versionCode = 51
+    versionName = "2.1.0"
     ndkVersion = "21.4.7075529"
 
     javaCompileVersion = JavaVersion.VERSION_1_8

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/org.envirocar.algorithm/build.gradle b/org.envirocar.algorithm/build.gradle
@@ -12,8 +12,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
     }
 
     buildTypes {

diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml
@@ -3,8 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.envirocar.app"
     android:installLocation="internalOnly"
-    android:versionCode="50"
-    android:versionName="2.0.0">
+    android:versionCode="51"
+    android:versionName="2.1.0"
+    >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -85,7 +86,8 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme.Cario">
+            android:theme="@style/Theme.Cario"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -116,13 +118,17 @@
             <!--</intent-filter>-->
         </service>
 
-        <receiver android:name=".services.SystemStartupReceiver">
+        <receiver
+            android:name=".services.SystemStartupReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
             </intent-filter>
         </receiver>
-        <receiver android:name="org.envirocar.app.services.WlanConnectionReceiver">
+        <receiver
+            android:name="org.envirocar.app.services.WlanConnectionReceiver"
+            android:exported="true">
             <intent-filter android:priority="100">
 <!--                <action android:name="android.net.wifi.STATE_CHANGE" />-->
                 <action android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" />

diff --git a/org.envirocar.app/build.gradle b/org.envirocar.app/build.gradle
@@ -51,9 +51,9 @@ dependencies {
     implementation rootProject.ext.rxBindingCore
     implementation rootProject.ext.rxBindingAppCompat
 
-    // MapBox SDK
-    implementation(rootProject.ext.mapbox) {
-        transitive = true
+    //MapBox SDK
+    implementation (rootProject.ext.mapbox){
+        exclude group: 'group_name', module: 'module_name'
     }
 
     // Test
@@ -103,11 +103,21 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
 
+    signingConfigs {
+        release {
+            storeFile file(project.properties['RELEASE_STORE_FILE'] ?: "/tmp/tmp.key")
+            storePassword project.properties['RELEASE_STORE_PASSWORD'] ?: ""
+            keyAlias project.properties['RELEASE_KEY_ALIAS'] ?: ""
+            keyPassword project.properties['RELEASE_KEY_PASSWORD'] ?: ""
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             zipAlignEnabled true
+            signingConfig signingConfigs.release
         }
     }
 

diff --git a/org.envirocar.app/res/layout/activity_recording_screen.xml b/org.envirocar.app/res/layout/activity_recording_screen.xml
@@ -76,7 +76,7 @@
                     android:gravity="center"
                     android:orientation="vertical">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/activity_recscreen_trackdetails_gps"
                         android:layout_width="25dp"
                         android:layout_height="25dp"
@@ -102,7 +102,7 @@
                     android:gravity="center"
                     android:orientation="vertical">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/activity_recscreen_trackdetails_bluetooth"
                         android:layout_width="25dp"
                         android:layout_height="25dp"
@@ -259,7 +259,7 @@
                 android:gravity="center"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"

diff --git a/org.envirocar.app/res/layout/activity_track_details_attributes.xml b/org.envirocar.app/res/layout/activity_track_details_attributes.xml
@@ -225,7 +225,7 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/activity_track_details_speed_image"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -265,7 +265,7 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/activity_track_details_stops_image"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -305,7 +305,7 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/activity_track_details_stoptime_image"
             android:layout_width="24dp"
             android:layout_height="24dp"

diff --git a/org.envirocar.app/res/layout/car_attributes_detail_bottomsheet.xml b/org.envirocar.app/res/layout/car_attributes_detail_bottomsheet.xml
@@ -144,7 +144,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/activity_car_details_attr_engine_image"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -185,7 +185,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_alignParentLeft="true"
@@ -263,7 +263,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/activity_car_details_attr_power_image"
                     android:layout_width="24dp"
                     android:layout_height="24dp"

diff --git a/org.envirocar.app/res/layout/car_detail_card_layout.xml b/org.envirocar.app/res/layout/car_detail_card_layout.xml
@@ -42,7 +42,7 @@
             android:paddingTop="5dp"
             android:paddingBottom="5dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/expandView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -118,7 +118,7 @@
                     android:paddingLeft="@dimen/activity_horizontal_margin"
                     android:paddingRight="@dimen/activity_horizontal_margin">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:layout_alignParentLeft="true"
@@ -231,7 +231,7 @@
                     android:paddingLeft="@dimen/activity_horizontal_margin"
                     android:paddingRight="@dimen/activity_horizontal_margin">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/activity_car_details_attr_engine_image"
                         android:layout_width="24dp"
                         android:layout_height="24dp"