aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-02 12:35:56 -0700
committerAllan Wang <me@allanwang.ca>2017-07-02 12:35:56 -0700
commit087cf39f15a0388a79dbe13a41f2ee59a519847c (patch)
tree5a278deab01e06fefd06088e3ec3b91209ef72cc
parentc0decd6f72d825db989275e216aa97741cce412f (diff)
downloadkau-087cf39f15a0388a79dbe13a41f2ee59a519847c.tar.gz
kau-087cf39f15a0388a79dbe13a41f2ee59a519847c.tar.bz2
kau-087cf39f15a0388a79dbe13a41f2ee59a519847c.zip
Update readme and use git versioning
-rw-r--r--README.md1
-rw-r--r--gradle.properties2
-rw-r--r--library/build.gradle13
-rw-r--r--sample/build.gradle13
-rw-r--r--sample/src/main/res/xml/changelog.xml9
5 files changed, 30 insertions, 8 deletions
diff --git a/README.md b/README.md
index d58cde5..ca53002 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@ Be sure to include the activity in your Manifest and have it extend `Kau.Translu
## Extension Functions
> "[Extensions](https://kotlinlang.org/docs/reference/extensions.html) provide the ability to extend a class with new functionality without having to inherit from the class"
+Note that since KAU depends on [ANKO](https://github.com/Kotlin/anko), all of the extensions in its core package is also in KAU.
### AnimUtils
> Extends View
diff --git a/gradle.properties b/gradle.properties
index 873d527..3e37fc2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,8 +20,6 @@ APP_GROUP=ca.allanwang
MIN_SDK=21
TARGET_SDK=26
BUILD_TOOLS=26.0.0
-VERSION_CODE=4
-VERSION_NAME=1.3
ANDROID_SUPPORT_LIBS=26.0.0-beta2
MATERIAL_DIALOG=0.9.4.3
diff --git a/library/build.gradle b/library/build.gradle
index 6b78ca8..714708b 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+ id 'com.gladed.androidgitversion' version '0.3.4'
+}
+
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'
@@ -8,11 +12,16 @@ android {
compileSdkVersion Integer.parseInt(project.TARGET_SDK)
buildToolsVersion project.BUILD_TOOLS
+ androidGitVersion {
+ codeFormat = 'MMNNPP'
+ prefix 'v'
+ }
+
defaultConfig {
minSdkVersion Integer.parseInt(project.MIN_SDK)
targetSdkVersion Integer.parseInt(project.TARGET_SDK)
- versionCode Integer.parseInt(project.VERSION_CODE)
- versionName project.VERSION_NAME
+ versionCode androidGitVersion.code()
+ versionName androidGitVersion.name()
consumerProguardFiles 'progress-proguard.txt'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
diff --git a/sample/build.gradle b/sample/build.gradle
index 8429f11..3e107a7 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+ id 'com.gladed.androidgitversion' version '0.3.4'
+}
+
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
@@ -5,12 +9,17 @@ android {
compileSdkVersion Integer.parseInt(project.TARGET_SDK)
buildToolsVersion project.BUILD_TOOLS
+ androidGitVersion {
+ codeFormat = 'MMNNPP'
+ prefix 'v'
+ }
+
defaultConfig {
applicationId "${project.APP_GROUP}." + project.APP_ID.toLowerCase() + ".sample"
minSdkVersion Integer.parseInt(project.MIN_SDK)
targetSdkVersion Integer.parseInt(project.TARGET_SDK)
- versionCode Integer.parseInt(project.VERSION_CODE)
- versionName project.VERSION_NAME
+ versionCode androidGitVersion.code()
+ versionName androidGitVersion.name()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/sample/src/main/res/xml/changelog.xml b/sample/src/main/res/xml/changelog.xml
index 6d76f24..534750c 100644
--- a/sample/src/main/res/xml/changelog.xml
+++ b/sample/src/main/res/xml/changelog.xml
@@ -6,6 +6,13 @@
<item text="" />
-->
+ <version title="v1.5"/>
+ <item text="Change snackbar builder" />
+ <item text="Remove FragmentUtils since the same functionality can be done from ANKO" />
+ <item text="" />
+ <item text="" />
+ <item text="" />
+
<version title="v1.4"/>
<item text="Added about activities" />
<item text="Added themed fast item adapter" />
@@ -14,8 +21,6 @@
<item text="Ported some views over from Plaid" />
<item text="Add string arg option for sendEmail" />
<item text="Add many iitems" />
- <item text="" />
- <item text="" />
<version title="v1.3"/>
<item text="Added kpref subitems" />