Commit f731c5fa authored by Javier Romero's avatar Javier Romero

Feature/upgrade build libraries

parent e435fc8a
......@@ -4,7 +4,7 @@ dependencies {
testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testCompile 'io.selendroid:selendroid-standalone:0.17.0'
testCompile 'io.selendroid:selendroid-client:0.17.0'
testCompile "junit:junit:4.11"
testCompile "junit:junit:4.12"
testCompile 'org.mariadb.jdbc:mariadb-java-client:2.2.5'
}
......
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
//apply plugin: 'io.fabric'
apply plugin: 'spoon'
apply plugin: 'kotlin-kapt'
repositories {
maven { url 'https://maven.fabric.io/public' }
mavenCentral()
jcenter()
google()
}
def buildNumber = System.env.BUILD_NUMBER ?: "dev"
android {
compileSdkVersion 23
compileSdkVersion 27
buildToolsVersion '28.0.1'
publishNonDefault true
defaultConfig {
versionCode 300020
versionName "3.0.2"
project.version = versionName
minSdkVersion 23
targetSdkVersion 23
targetSdkVersion 27
}
testOptions {
unitTests.returnDefaultValues = true
}
packagingOptions {
exclude 'META-INF/services/java.sql.Driver'
exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
......@@ -36,11 +37,12 @@ android {
exclude 'META-INF/NOTICE.txt'
exclude 'LICENSE.txt'
}
dexOptions {
javaMaxHeapSize "4g"
jumboMode true
incremental true
}
buildTypes {
debug {
versionNameSuffix "-SNAPSHOT"
......@@ -51,9 +53,11 @@ android {
minifyEnabled false
}
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile = new File(
......@@ -62,9 +66,10 @@ android {
)
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
productFlavors {
......@@ -72,47 +77,50 @@ android {
}
}
kapt {
generateStubs = true
mapDiagnosticLocations = true
}
ext {
SUPPORT_VERSION = "23.1.1"
version_crashlytcs = '2.3.2'
version_dagger = '2.16'
version_jsr250 = '1.0'
version_logback_android = '1.1.1-12'
version_mariadb = '1.7.4'
version_mixpanel = '4.6.0'
version_patternlock = '2.0.1'
version_rx = '1.1.0'
version_saripaar = '1.0.3'
version_sqlcipher = '3.5.9'
version_slf4j = '1.7.25'
version_support = '27.1.1'
}
dependencies {
compile fileTree(include: '*.jar', dir: 'libs')
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile 'com.mobsandgeeks:android-saripaar:1.0.3'
compile "com.android.support:support-annotations:${SUPPORT_VERSION}"
compile "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
compile "com.android.support:cardview-v7:${SUPPORT_VERSION}"
compile "com.android.support:design:${SUPPORT_VERSION}"
compile "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
compile 'net.zetetic:android-database-sqlcipher:3.3.1-2'
compile 'com.mixpanel.android:mixpanel-android:4.6.0'
compile('com.crashlytics.sdk.android:crashlytics:2.3.2@aar') {
compile "com.mobsandgeeks:android-saripaar:${version_saripaar}"
compile "com.android.support:support-annotations:${version_support}"
compile "com.android.support:appcompat-v7:${version_support}"
compile "com.android.support:cardview-v7:${version_support}"
compile "com.android.support:design:${version_support}"
compile "com.android.support:recyclerview-v7:${version_support}"
compile "com.github.tony19:logback-android:${version_logback_android}"
kapt "com.google.dagger:dagger-android-processor:${version_dagger}"
kapt "com.google.dagger:dagger-compiler:${version_dagger}"
compile "com.google.dagger:dagger:${version_dagger}"
compile "com.google.dagger:dagger-android:${version_dagger}"
compile "com.google.dagger:dagger-android-support:${version_dagger}"
compile "com.mixpanel.android:mixpanel-android:${version_mixpanel}"
compile("com.crashlytics.sdk.android:crashlytics:${version_crashlytcs}@aar") {
transitive = true;
}
compile 'me.zhanghai.android.patternlock:library:2.0.1'
compile 'org.mariadb.jdbc:mariadb-java-client:1.7.4'
// Dagger 2
compile 'com.google.dagger:dagger:2.0.1'
kapt "com.google.dagger:dagger-compiler:2.0.1"
compile 'javax.annotation:jsr250-api:1.0'
compile 'io.reactivex:rxandroid:1.1.0'
compile 'io.reactivex:rxjava:1.1.0'
// logging
compile 'org.slf4j:slf4j-api:1.7.13'
compile 'com.github.tony19:logback-android-classic:1.1.1-4'
compile 'com.github.tony19:logback-android-core:1.1.1-4'
compile "javax.annotation:jsr250-api:${version_jsr250}"
compile "io.reactivex:rxandroid:${version_rx}"
compile "io.reactivex:rxjava:${version_rx}"
compile "me.zhanghai.android.patternlock:library:${version_patternlock}"
compile "net.zetetic:android-database-sqlcipher:${version_sqlcipher}"
compile "org.mariadb.jdbc:mariadb-java-client:${version_mariadb}"
compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
compile "org.slf4j:slf4j-api:${version_slf4j}"
}
buildscript {
repositories {
jcenter()
mavenCentral()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'io.fabric.tools:gradle:1.20.1'
}
}
\ No newline at end of file
......@@ -257,15 +257,8 @@ class DashboardActivity : BaseActivity() {
}
private val mConnectionsLoaderCallbacks = object : LoaderManager.LoaderCallbacks<Cursor> {
override fun onCreateLoader(id: Int, args: Bundle): Loader<Cursor>? {
try {
return ConnectionInfoCursorLoader(this@DashboardActivity)
} catch (e: ContentUriHelper.BaseUriNotFoundException) {
Log.e(TAG, e.message)
return null
}
override fun onCreateLoader(id: Int, args: Bundle?): Loader<Cursor> {
return ConnectionInfoCursorLoader(this@DashboardActivity)
}
override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor?) {
......
......@@ -28,7 +28,7 @@ class UserPreferences(context: Context) {
else entry.value as T
}
public fun <T> save(option: Option<T>): Unit {
public fun <T> save(option: Option<T>) {
when (option) {
is Option.BooleanOption -> sharedPreferences.edit().putBoolean(option.key, option.value).apply()
is Option.LongOption -> sharedPreferences.edit().putLong(option.key, option.value).apply()
......
buildscript {
ext.kotlin_version = '1.2.51'
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.0.2'
classpath 'com.github.CantilSoftware:sdk-manager-plugin:551c2322d985c062cba3d73fadec66aa0c9c1a59'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
apply plugin: 'kotlin'
apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
allprojects {
repositories {
mavenCentral()
google()
jcenter()
maven { url "https://jitpack.io" }
}
}
repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
task clean(type: Delete) {
delete rootProject.buildDir
}
\ No newline at end of file
#Sun Jan 03 11:30:36 CST 2016
#Sun Jul 15 21:37:51 CDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
include ':app', ':acceptance-tests'
\ No newline at end of file
include ':app'
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment