Skip to content

Commit

Permalink
Remove Multidex usages (#5034)
Browse files Browse the repository at this point in the history
Since the min SDK is 23, 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 Nov 4, 2024
1 parent 2683546 commit 12b8803
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
3 changes: 0 additions & 3 deletions catroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ android {
versionName defaultVersionName
println "VersionCode is $versionCode"
println "VersionName is $versionName"
multiDexEnabled true
manifestPlaceholders += [appName: manifestAppName,
appIcon: manifestAppIcon,
intentFilterScheme: "https",
Expand Down Expand Up @@ -386,7 +385,6 @@ dependencies {
implementation 'androidx.browser:browser:1.2.0'

implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
implementation 'androidx.multidex:multidex:2.0.1'

implementation ('com.opencsv:opencsv:5.0') {
exclude group: 'org.apache.commons', module: 'commons-text'
Expand Down Expand Up @@ -498,7 +496,6 @@ dependencies {
testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'

testImplementation 'org.robolectric:robolectric:4.7.3'
testImplementation 'org.robolectric:shadows-multidex:4.7.3'

testImplementation 'org.reflections:reflections:0.9.11'
testImplementation 'org.json:json:20190722'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@

import java.util.Locale;

import androidx.multidex.MultiDex;

public class CatroidApplication extends Application {

private static final String TAG = CatroidApplication.class.getSimpleName();
Expand Down Expand Up @@ -89,12 +87,6 @@ private void setupHuaweiMobileServices() {
MLApplication.getInstance().setApiKey(apiKey);
}

@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
MultiDex.install(this);
}

public synchronized Tracker getDefaultTracker() {
if (googleTracker == null) {
googleTracker = googleAnalytics.newTracker(R.xml.global_tracker);
Expand Down

0 comments on commit 12b8803

Please sign in to comment.