Commit c7e13397 authored by Drahomír Karchňák's avatar Drahomír Karchňák

Merge branch 'devel' into 'master'

Devel

See merge request netmetr!24
parents ca45002c 76b1f952
......@@ -16,9 +16,10 @@ out/
build/
.gradle/
gradle.properties
local.properties
## OS Specific
.DS_Store
## General
*.zip
*.zip
\ No newline at end of file
......@@ -38,7 +38,7 @@ ControlServerRelease:
paths:
- RMBTControlServer/build/libs/RMBTControlServer.war
AndroidApp:
AndroidAppDev:
stage: AndroidApp
except:
- tags
......@@ -47,11 +47,24 @@ AndroidApp:
- >
if git diff $LAST_PIPELINE_COMMIT HEAD --name-only|grep RMBTAndroid; then
echo "Starting Android App build!" &&
cd RMBTAndroid/ && ./gradlew clean build && cd ..
cd RMBTAndroid/ && ./gradlew clean assembleDev test lint && cd ..
fi;
artifacts:
paths:
- RMBTAndroid/build/outputs/apk/RMBTAndroid*.apk
- RMBTAndroid/build/outputs/apk/dev/*.apk
AndroidAppDebug:
stage: AndroidApp
only:
- tags
allow_failure: true
script:
- >
echo "Starting Android App build!" &&
cd RMBTAndroid/ && ./gradlew clean assembleDebug test lint && cd ..
artifacts:
paths:
- RMBTAndroid/build/outputs/apk/debug/*.apk
AndroidAppRelease:
stage: AndroidApp
......@@ -61,10 +74,10 @@ AndroidAppRelease:
script:
- >
echo "Starting Android App build!" &&
cd RMBTAndroid/ && ./gradlew clean build && cd ..
cd RMBTAndroid/ && ./gradlew clean assembleRelease test lint && cd ..
artifacts:
paths:
- RMBTAndroid/build/outputs/apk/RMBTAndroid*.apk
- RMBTAndroid/build/outputs/apk/release/*.apk
StatisticServer:
stage: StatisticServer
......
......@@ -37,8 +37,8 @@
<uses-feature android:name="android.hardware.wifi" android:required="false"/>
<application
android:icon="@drawable/app_icon"
android:logo="@drawable/app_icon"
android:icon="@mipmap/ic_launcher"
android:logo="@mipmap/ic_launcher"
android:label="@string/app_name" android:allowBackup="true"
android:supportsRtl="false">
<activity android:name="at.alladin.rmbt.android.main.RMBTMainActivity"
......@@ -71,12 +71,16 @@
<activity android:label="@string/history_button_sync" android:name="at.alladin.rmbt.android.sync.RMBTSyncActivity"
android:theme="@style/PreferenceTheme"
android:enabled="true" />
android:enabled="true" />
<activity android:label="@string/user_server_selection" android:name="at.alladin.rmbt.android.preferences.RMBTServerSelectActivity"
android:theme="@style/PreferenceTheme"
android:enabled="true" />
<service android:enabled="true" android:name="at.alladin.rmbt.android.test.RMBTService" android:exported="false" />
<service android:enabled="true" android:name="at.alladin.rmbt.android.test.RMBTLoopService" android:exported="false" />
<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="GOOGLEMAPS_APIKEY"/>
<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="${GOOGLE_MAPS_API_KEY}"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<meta-data android:name="cz.nic.labs.rmbt.android.test.RMBTBugReport" android:value="RMBT_USE_BUGREPORT"/>
</application>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.