diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-19 20:00:02 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-19 20:00:02 -0700 |
| commit | de0836ae903ccd6ee75d27e4c7e59fbcc1eb364c (patch) | |
| tree | d685276c24ec2bb3c12765e99e6d9beb3a59e70e | |
| parent | 94defc1ab5f9f987d5c1b14c91613364ce4ed1ba (diff) | |
| download | kau-de0836ae903ccd6ee75d27e4c7e59fbcc1eb364c.tar.gz kau-de0836ae903ccd6ee75d27e4c7e59fbcc1eb364c.tar.bz2 kau-de0836ae903ccd6ee75d27e4c7e59fbcc1eb364c.zip | |
Add source dirs
| -rw-r--r-- | .idea/misc.xml | 2 | ||||
| -rw-r--r-- | build.gradle | 1 | ||||
| -rw-r--r-- | library/build.gradle | 25 | ||||
| -rw-r--r-- | library/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt | 2 |
4 files changed, 28 insertions, 2 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml index 085136f..7319f02 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -53,7 +53,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/build.gradle b/build.gradle index 0387685..b0476be 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/library/build.gradle b/library/build.gradle index 44f22cf..e5d29ba 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion Integer.parseInt(project.TARGET_SDK) @@ -61,4 +62,28 @@ dependencies { compile "com.jakewharton:butterknife:${BUTTERKNIFE}" annotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE}" +} + +// build a jar with source files +task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' +} + +task javadoc(type: Javadoc) { + failOnError false + source = android.sourceSets.main.java.sourceFiles + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + classpath += configurations.compile +} + +// build a jar with javadoc +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar + archives javadocJar }
\ No newline at end of file diff --git a/library/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt b/library/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt index cc72921..4db63d2 100644 --- a/library/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt +++ b/library/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt @@ -34,7 +34,7 @@ fun Activity.restart(extras: ((Intent) -> Unit)? = null) { fun Context.startActivity(clazz: Class<out Activity>, clearStack: Boolean = false, intentBuilder: Intent.() -> Unit = {}, bundle: Bundle? = null) { val intent = (Intent(this, clazz)) - if (clearStack) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) + if (clearStack) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) intent.intentBuilder() ContextCompat.startActivity(this, intent, bundle) if (this is Activity && clearStack) finish() |