kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

For 2.5: Proposal: Use Kotlin as the primary development language for… (#1167)

Browse Source 
* For 2.5: Proposal: Use Kotlin as the primary development language for Kiwix #648

* Update mockito

* apply 2 space indent
This commit is contained in:
macgills 2019-04-30 09:37:55 +01:00 committed by GitHub
parent b6957df14c
commit c83e6f2fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -8,13 +8,14 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.testdroid:gradle:1.5.0'
classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
}
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'
apply plugin: 'checkstyle'
apply plugin: 'testdroid'
@ -121,8 +122,8 @@ dependencies {
androidTestImplementation 'junit:junit:4.12'
// Mockito
testImplementation "org.mockito:mockito-core:2.7.22"
androidTestImplementation "org.mockito:mockito-android:2.7.22"
testImplementation "org.mockito:mockito-core:2.24.5"
androidTestImplementation "org.mockito:mockito-android:2.24.5"
// Leak canary
implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
@ -138,6 +139,7 @@ dependencies {
}
}
}
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
// Set custom app import directory

32
build.gradle
View File

@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.3.31'
repositories {
jcenter()
google()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.android.tools.build:gradle:3.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -14,22 +14,22 @@ buildscript {
}
ext {
supportLibraryVersion = '27.0.2'
rxJavaVersion = '2.1.9'
rxAndroidVersion = '2.0.2'
okHttpVersion = '3.9.1'
retrofitVersion = '2.3.0'
javaxAnnotationVersion = '1.3.2'
daggerVersion = '2.15'
supportLibraryVersion = '27.0.2'
rxJavaVersion = '2.1.9'
rxAndroidVersion = '2.0.2'
okHttpVersion = '3.9.1'
retrofitVersion = '2.3.0'
javaxAnnotationVersion = '1.3.2'
daggerVersion = '2.15'
}
allprojects {
repositories {
jcenter()
google()
}
repositories {
jcenter()
google()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
delete rootProject.buildDir
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Tue Mar 27 23:53:46 IST 2018
#Wed Apr 24 09:03:54 BST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip