From 40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 9 Jul 2017 00:24:40 -0700 Subject: Clean up gradle and test build --- sample/build.gradle | 22 +++++++++++++++------- .../ca/allanwang/kau/sample/AboutActivity.kt | 1 + .../kotlin/ca/allanwang/kau/sample/MainActivity.kt | 11 +++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) (limited to 'sample') diff --git a/sample/build.gradle b/sample/build.gradle index 11b7a60..be204d0 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,10 +1,16 @@ plugins { id 'com.gladed.androidgitversion' version '0.3.4' } - apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +repositories { + jcenter() + mavenCentral() + maven { url "https://jitpack.io" } + maven { url "https://maven.google.com" } +} + android { compileSdkVersion Integer.parseInt(project.TARGET_SDK) buildToolsVersion project.BUILD_TOOLS @@ -15,20 +21,25 @@ android { } defaultConfig { - applicationId "${project.APP_GROUP}." + project.APP_ID.toLowerCase() + ".sample" minSdkVersion Integer.parseInt(project.MIN_SDK) targetSdkVersion Integer.parseInt(project.TARGET_SDK) versionCode androidGitVersion.code() versionName androidGitVersion.name() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { + abortOnError false + checkReleaseBuilds false + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' @@ -50,8 +61,5 @@ dependencies { }) testCompile 'junit:junit:4.12' compile "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar" - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} -repositories { - mavenCentral() + compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}" } diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt index de741ab..e675ebf 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt @@ -1,5 +1,6 @@ package ca.allanwang.kau.sample +import ca.allanwang.kau.about.AboutActivityBase import ca.allanwang.kau.adapters.FastItemThemedAdapter import ca.allanwang.kau.iitems.CardIItem import com.mikepenz.fastadapter.IItem diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt index 81f34d2..9a874cb 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt @@ -4,8 +4,19 @@ import android.os.Bundle import android.os.PersistableBundle import android.view.Menu import android.view.MenuItem +import ca.allanwang.kau.email.sendEmail +import ca.allanwang.kau.kpref.activity.CoreAttributeContract +import ca.allanwang.kau.kpref.activity.KPrefActivity +import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder import ca.allanwang.kau.searchview.SearchItem import ca.allanwang.kau.searchview.SearchView +import ca.allanwang.kau.searchview.bindSearchView +import ca.allanwang.kau.ui.views.RippleCanvas +import ca.allanwang.kau.utils.materialDialog +import ca.allanwang.kau.utils.navigationBarColor +import ca.allanwang.kau.utils.startActivity +import ca.allanwang.kau.utils.toast +import com.mikepenz.google_material_typeface_library.GoogleMaterial class MainActivity : KPrefActivity() { -- cgit v1.2.3