Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {
versionName "1.3"
multiDexEnabled true
}
buildTypes {2
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
Expand All @@ -27,5 +27,5 @@ dependencies {
compile 'com.android.support:design:23.4.0'
compile 'com.github.bloder:magic:1.1'
compile 'com.google.android.gms:play-services:9.4.0'
compile 'com.android.support:multidex:1.0.0'
compile 'androidx.multidex:multidex:2.0.1'
Comment on lines +27 to +30
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P1] Add Google Maven repository for AndroidX MultiDex

The new dependency androidx.multidex:multidex:2.0.1 will not resolve because this project’s Gradle configuration only declares jcenter() for both buildscript and allprojects repositories. AndroidX artifacts are served from the Google Maven repository, so Gradle 2.1.2 with jcenter alone will fail with Could not find androidx.multidex:multidex:2.0.1. Either add google() (or the explicit Maven URL) to the repositories or keep using the support library version to avoid breaking the build.

Useful? React with 👍 / 👎.

}
31 changes: 17 additions & 14 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.akarshan.drivelert"
android:versionCode="2">

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="22" />
package="com.example.akarshan.drivelert">

<uses-feature android:name="android.hardware.camera" />
<uses-permission android:name="android.permission.CAMERA" />
Expand All @@ -14,21 +9,24 @@
<application
android:allowBackup="true"
android:largeHeap="true"
android:name="android.support.multidex.MultiDexApplication"
android:name="androidx.multidex.MultiDexApplication"
android:icon="@drawable/l"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".FaceTrackerActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:exported="false" />
<activity
android:name=".help"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:exported="false" />
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -37,9 +35,14 @@
</activity>
<activity
android:name=".monitor_menu"
android:screenOrientation="portrait" />
<activity android:name=".end" />
<activity android:name=".contactus" />
android:screenOrientation="portrait"
android:exported="false" />
<activity
android:name=".end"
android:exported="false" />
<activity
android:name=".contactus"
android:exported="false" />
</application>

</manifest>
</manifest>