Skip to content

Commit

Permalink
Remove Multidex declaration (#991)
Browse files Browse the repository at this point in the history
Since the min SDK is 24, it is no longer necessary to use the Multidex library.

See the following for more info: https://developer.android.com/build/multidex#mdex-on-l
  • Loading branch information
MGaetan89 authored Jan 3, 2025
1 parent bc8639c commit a6e4027
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
9 changes: 3 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ android {
targetSdkVersion 35
versionCode versionNum
versionName version.toString()
multiDexEnabled true

testInstrumentationRunner "com.thebluealliance.androidclient.testing.TbaInstrumentationRunner"

Expand Down Expand Up @@ -148,9 +147,9 @@ android {

android.applicationVariants.all { variant ->
variant.outputs.each { output ->
def apkName = "tba-android-";
apkName += "v" + version.tagName;
apkName += "-" + variant.buildType.name + ".apk";
def apkName = "tba-android-"
apkName += "v" + version.tagName
apkName += "-" + variant.buildType.name + ".apk"
output.outputFileName = apkName
}
}
Expand Down Expand Up @@ -237,7 +236,6 @@ dependencies {
implementation 'androidx.core:core:1.7.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.preference:preference:1.2.1'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
Expand Down Expand Up @@ -307,7 +305,6 @@ dependencies {
testImplementation 'androidx.test.ext:junit:1.1.5'
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.robolectric:robolectric:${robolectricVersion}"
testImplementation "org.robolectric:shadows-multidex:${robolectricVersion}"
testAnnotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"

// instrumentation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static com.thebluealliance.androidclient.gcm.notifications.BaseNotification.NOTIFICATION_CHANNEL;

import android.app.Application;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.os.Build;
Expand All @@ -10,7 +11,6 @@
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.hilt.work.HiltWorkerFactory;
import androidx.multidex.MultiDexApplication;
import androidx.work.Configuration;

import com.facebook.stetho.Stetho;
Expand All @@ -22,7 +22,7 @@
import dagger.hilt.android.HiltAndroidApp;

@HiltAndroidApp
public class TbaAndroid extends MultiDexApplication implements Configuration.Provider {
public class TbaAndroid extends Application implements Configuration.Provider {

@Inject TBAStatusController mStatusController;
@Inject AppConfig mAppConfig;
Expand Down

0 comments on commit a6e4027

Please sign in to comment.