mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 10:46:53 -04:00
Updated the gradle files. (#868)
* Change the layout_height parameter to more appropriate attribute. * Changed compile to implementation in build.gradle files.
This commit is contained in:
parent
4ef37ef02b
commit
c28d53bee6
@ -8,7 +8,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.1.0'
|
||||
classpath 'com.android.tools.build:gradle:3.1.4'
|
||||
classpath 'com.testdroid:gradle:1.5.0'
|
||||
classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
|
||||
}
|
||||
@ -50,7 +50,7 @@ dependencies {
|
||||
implementation "com.android.support:cardview-v7:$supportLibraryVersion"
|
||||
implementation 'com.android.support:multidex:1.0.2'
|
||||
|
||||
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||
|
||||
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
|
||||
|
||||
@ -68,7 +68,7 @@ dependencies {
|
||||
exclude group: 'com.android.support', module: 'recyclerview-v7'
|
||||
}
|
||||
|
||||
androidTestCompile('com.schibsted.spain:barista:2.4.0') {
|
||||
androidTestImplementation('com.schibsted.spain:barista:2.4.0') {
|
||||
exclude group: 'com.android.support'
|
||||
}
|
||||
|
||||
|
@ -15,12 +15,12 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/toolbar_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?actionBarSize">
|
||||
android:layout_height="?android:attr/actionBarSize">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?actionBarSize"
|
||||
android:layout_height="?android:attr/actionBarSize"
|
||||
android:background="?colorPrimaryDark"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay"
|
||||
app:theme="@style/AppTheme.AppBarOverlay" />
|
||||
|
@ -6,7 +6,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.1.0'
|
||||
classpath 'com.android.tools.build:gradle:3.1.4'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
@ -1,3 +1,4 @@
|
||||
android.enableD8=true
|
||||
android.enableD8.desugaring=true
|
||||
org.gradle.configureondemand=false
|
||||
org.gradle.jvmargs=-Xmx4096m
|
||||
|
Loading…
x
Reference in New Issue
Block a user