bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated dependencies, enabled multidex

Browse Source
This commit is contained in:
Christian Basler 2017-04-16 22:36:23 +02:00
parent f77bbe1a43
commit 55746743c4
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -21,6 +21,7 @@ android {
versionCode 11 versionCode 11
versionName "1.0-beta11" versionName "1.0-beta11"
jackOptions.enabled = false jackOptions.enabled = false
multiDexEnabled true
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
@ -45,6 +46,7 @@ dependencies {
compile "com.android.support:appcompat-v7:$supportVersion" compile "com.android.support:appcompat-v7:$supportVersion"
compile "com.android.support:support-v4:$supportVersion" compile "com.android.support:support-v4:$supportVersion"
compile "com.android.support:design:$supportVersion" compile "com.android.support:design:$supportVersion"
compile "com.android.support:multidex:1.0.1"
compile "ch.dissem.jabit:jabit-core:$jabitVersion" compile "ch.dissem.jabit:jabit-core:$jabitVersion"
compile "ch.dissem.jabit:jabit-networking:$jabitVersion" compile "ch.dissem.jabit:jabit-networking:$jabitVersion"
@ -55,10 +57,10 @@ dependencies {
compile 'org.slf4j:slf4j-android:1.7.25' compile 'org.slf4j:slf4j-android:1.7.25'
compile 'com.mikepenz:materialize:1.0.1@aar' compile 'com.mikepenz:materialize:1.0.1@aar'
compile('com.mikepenz:materialdrawer:5.8.2@aar') { compile('com.mikepenz:materialdrawer:5.9.0@aar') {
transitive = true transitive = true
} }
compile('com.mikepenz:aboutlibraries:5.9.4@aar') { compile('com.mikepenz:aboutlibraries:5.9.5@aar') {
transitive = true transitive = true
} }
compile "com.mikepenz:iconics-core:2.8.2@aar" compile "com.mikepenz:iconics-core:2.8.2@aar"
@ -68,7 +70,7 @@ dependencies {
compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar' compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
compile 'com.google.zxing:core:3.3.0' compile 'com.google.zxing:core:3.3.0'
compile 'io.github.yavski:fab-speed-dial:1.0.7' compile 'io.github.yavski:fab-speed-dial:1.0.6'
compile 'com.github.amlcurran.showcaseview:library:5.4.3' compile 'com.github.amlcurran.showcaseview:library:5.4.3'
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar') { compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar') {
transitive = true transitive = true
@ -77,7 +79,7 @@ dependencies {
compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.7.21' testCompile 'org.mockito:mockito-core:2.7.22'
} }
idea.module { idea.module {

1
app/src/main/AndroidManifest.xml
View File

@ -19,6 +19,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:name="android.support.multidex.MultiDexApplication"
tools:replace="android:allowBackup"> tools:replace="android:allowBackup">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong