diff options
| author | Konrad Pozniak <k.pozniak@gmx.at> | 2021-04-09 18:13:58 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-04-09 22:40:48 +0300 |
| commit | 1cb9573c8d16bcac3e21e551bad9c6f9d3d3ebd9 (patch) | |
| tree | f36646862206d3c93df3021bbf63afd0cba5e62b | |
| parent | 46514034afd05551a03dfc99283d07053618c3e8 (diff) | |
remove multidex
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java | 3 | ||||
| -rw-r--r-- | markdown/build.gradle | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index 63b0f765..c0c38c27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,6 @@ android { targetSdkVersion 29 versionCode 3003001 versionName "3.3.1" - multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -83,7 +82,6 @@ dependencies { implementation 'androidx.work:work-runtime:2.5.0' implementation "com.google.android.material:material:1.3.0" - implementation 'androidx.multidex:multidex:2.0.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' // Testing diff --git a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java index 7d02a1f4..7299bc59 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java @@ -7,14 +7,13 @@ import android.content.res.Configuration; import android.util.Log; import androidx.appcompat.app.AppCompatDelegate; -import androidx.multidex.MultiDexApplication; import androidx.preference.PreferenceManager; import it.niedermann.owncloud.notes.preferences.DarkModeSetting; import static androidx.preference.PreferenceManager.getDefaultSharedPreferences; -public class NotesApplication extends MultiDexApplication { +public class NotesApplication extends Application { private static final String TAG = NotesApplication.class.getSimpleName(); private static final long LOCK_TIME = 30_000; diff --git a/markdown/build.gradle b/markdown/build.gradle index d85d559d..47e219fa 100644 --- a/markdown/build.gradle +++ b/markdown/build.gradle @@ -7,12 +7,11 @@ android { buildToolsVersion "30.0.3" defaultConfig { - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 30 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - multiDexEnabled true } compileOptions { @@ -57,7 +56,6 @@ dependencies { implementation "com.yydcdut:markdown-processor:$rxMarkdownVersion" implementation "com.yydcdut:rxmarkdown-wrapper:$rxMarkdownVersion" - implementation 'androidx.multidex:multidex:2.0.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' testImplementation 'junit:junit:4.13.2' |