kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-10 16:02:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated the gradle files. (#868)

Browse Source 
* Change the layout_height parameter to more appropriate attribute.

* Changed compile to implementation in build.gradle files.
This commit is contained in:
Ritik Kumar 2018-10-09 02:47:13 +05:30 committed by Isaac Hutt
parent 4ef37ef02b
commit c28d53bee6
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
} }
dependencies { 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 'com.testdroid:gradle:1.5.0'
classpath 'org.apache.httpcomponents:httpclient-android:4.3.3' 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:cardview-v7:$supportLibraryVersion"
implementation 'com.android.support:multidex:1.0.2' 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' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
@ -68,7 +68,7 @@ dependencies {
exclude group: 'com.android.support', module: 'recyclerview-v7' 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' exclude group: 'com.android.support'
} }

4
app/src/main/res/layout/search.xml
View File

@ -15,12 +15,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar_layout" android:id="@+id/toolbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?actionBarSize"> android:layout_height="?android:attr/actionBarSize">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?actionBarSize" android:layout_height="?android:attr/actionBarSize"
android:background="?colorPrimaryDark" android:background="?colorPrimaryDark"
app:popupTheme="@style/AppTheme.PopupOverlay" app:popupTheme="@style/AppTheme.PopupOverlay"
app:theme="@style/AppTheme.AppBarOverlay" /> app:theme="@style/AppTheme.AppBarOverlay" />

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

1
gradle.properties
View File

@ -1,3 +1,4 @@
android.enableD8=true android.enableD8=true
android.enableD8.desugaring=true android.enableD8.desugaring=true
org.gradle.configureondemand=false
org.gradle.jvmargs=-Xmx4096m org.gradle.jvmargs=-Xmx4096m