diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-27 11:00:48 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-27 11:00:48 -0700 |
| commit | 7871b27bcc5cffcc5bc6ca380d7ad4456cb40eda (patch) | |
| tree | 48963df39facbd57e6088d9a4eb00019069e0ee4 /library | |
| parent | 1e5b600a5f6bbffa4dc8efa2991e4b833a8e4c15 (diff) | |
| download | kau-7871b27bcc5cffcc5bc6ca380d7ad4456cb40eda.tar.gz kau-7871b27bcc5cffcc5bc6ca380d7ad4456cb40eda.tar.bz2 kau-7871b27bcc5cffcc5bc6ca380d7ad4456cb40eda.zip | |
Exclude kotlin in library
Diffstat (limited to 'library')
| -rw-r--r-- | library/build.gradle | 4 | ||||
| -rw-r--r-- | library/src/main/res/layout/kau_activity_about.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/build.gradle b/library/build.gradle index d4d7821..c6a4904 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -63,7 +63,9 @@ dependencies { compile "com.jakewharton.timber:timber:${TIMBER}" - compile "org.jetbrains.anko:anko-commons:${ANKO}" + compile ("org.jetbrains.anko:anko-commons:${ANKO}") { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib' + } compile "io.reactivex.rxjava2:rxkotlin:${RX_JAVA}" compile "io.reactivex.rxjava2:rxandroid:${RX_ANDROID}" diff --git a/library/src/main/res/layout/kau_activity_about.xml b/library/src/main/res/layout/kau_activity_about.xml index 1be7c17..21d9306 100644 --- a/library/src/main/res/layout/kau_activity_about.xml +++ b/library/src/main/res/layout/kau_activity_about.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent"> <android.support.v7.widget.Toolbar - android:id="@id/kau_toolbar" + android:id="@+id/kau_toolbar" android:layout_width="0dp" android:layout_height="?attr/actionBarSize" app:layout_constraintEnd_toEndOf="parent" |