Skip to content
Snippets Groups Projects
Commit 39172ca5 authored by MAUGEZ Emeline's avatar MAUGEZ Emeline
Browse files

Merge branch 'main' of gitlab.imt-atlantique.fr:procom2022-robotise/android-app

parents 9fda425c 29bc1525
No related branches found
No related tags found
No related merge requests found
Showing
with 6 additions and 10 deletions
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -14,7 +14,6 @@
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
......
......@@ -6,11 +6,11 @@ android {
compileSdk 31
defaultConfig {
applicationId "com.example.robotise"
applicationId "imt.procom.robotise"
minSdk 21
targetSdk 31
versionCode 1
versionName "1.0"
versionCode 2
versionName "Alpha"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
......
File added
......@@ -12,7 +12,6 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
......
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file should *NOT* be checked into Version Control Systems,
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=C\:\\Users\\Emeline\\AppData\\Local\\Android\\Sdk
\ No newline at end of file
#Wed Mar 15 18:27:56 CET 2023
sdk.dir=/Users/iriseden/Library/Android/sdk
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment