Added bintray configuration

Author: JesperSjoquist

README.md

@@ -2,3 +2,26 @@
 
 # ReactantKUtils
 A collection of Kotlin utility methods for Android
+
+
+### License
+
+ Copyright 2017 Jesper Sjöquist
+
+ Permission is hereby granted, free of charge, to any person obtaining a 
+ copy of this software and associated documentation files (the "Software"), 
+ to deal in the Software without restriction, including without limitation 
+ the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ and/or sell copies of the Software, and to permit persons to whom the 
+ Software is furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in 
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ DEALINGS IN THE SOFTWARE.

build.gradle

@@ -8,9 +8,8 @@ buildscript {
  dependencies {
  classpath 'com.android.tools.build:gradle:2.3.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
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
  }
 }
 
@@ -23,3 +22,10 @@ allprojects {
 task clean(type: Delete) {
  delete rootProject.buildDir
 }
+
+// Disable JavaDoc generation
+subprojects {
+ tasks.withType(Javadoc) {
+ excludes = ['**/*.kt'] // < ---- Exclude all kotlin files from javadoc file.
+ }
+}

gradle.properties

@@ -15,3 +15,9 @@ org.gradle.jvmargs=-Xmx2048m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+
+VERSION_CODE = 1
+VERSION_NAME = 0.0.2
+GROUP_ID = se.reactant
+ARTIFACT_ID = reactantutils

reactantkutils/build.gradle

@@ -0,0 +1,71 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
+
+ext {
+ bintrayRepo = 'maven'
+ bintrayName = 'reactantutils'
+
+ publishedGroupId = project.GROUP_ID
+ libraryName = project.ARTIFACT_ID
+ artifact = project.ARTIFACT_ID
+
+ libraryDescription = 'A collection of utility methods for Android written in Kotlin'
+
+ siteUrl = 'https://github.com/JesperSjoquist/ReactantUtils'
+ gitUrl = 'https://github.com/JesperSjoquist/ReactantUtils.git'
+
+ libraryVersion = project.VERSION_NAME
+
+ developerId = 'JesperSjoquist'
+ developerName = 'Jesper Sjöquist'
+ developerEmail = 'jesper.sjoquist@gmail.com'
+
+ licenseName = 'MIT'
+ licenseUrl = 'http://www.opensource.org/licenses/mit-license.php'
+ allLicenses = ["MIT"]
+}
+
+android {
+ compileSdkVersion 25
+ buildToolsVersion "25.0.0"
+
+ defaultConfig {
+ minSdkVersion 8
+ targetSdkVersion 25
+ versionCode project.VERSION_CODE.toInteger()
+ versionName project.VERSION_NAME
+
+ }
+}
+
+task sourceJar(type: Jar) {
+ from android.sourceSets.main.java.srcDirs
+ classifier "source"
+}
+
+publishing {
+ publications {
+ maven(MavenPublication) {
+ groupId project.GROUP_ID
+ artifactId project.ARTIFACT_ID
+ version project.VERSION_NAME
+ artifact(sourceJar)
+ artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+ }
+ }
+ repositories {
+ maven {
+ url "$buildDir/repo"
+ }
+ }
+}
+
+dependencies {
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+ compile 'com.google.code.gson:gson:2.8.0'
+ testCompile 'junit:junit:4.12'
+}
+
+// Upload to Bintray
+apply plugin: 'com.jfrog.bintray'

reactantkutils/.gitignore renamed to reactantutils/.gitignore

@@ -5,7 +5,6 @@ import android.util.Log
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import se.reactant.reactantutils.BuildConfig
 
 /**
  * Extensions for the Android util Log class
@@ -14,43 +13,36 @@ import se.reactant.reactantutils.BuildConfig
 
 const val UNKNOWN_CLASS_TAG = "UNKNOWN CLASS"
 const val JSON_INDENTATION = 2
-private var cachedCallingClassIndex = -1
 
-fun i(message: String? = "", throwable: Throwable? = null, tag: String? = ""): Unit {
- if (BuildConfig.DEBUG) Log.i(getCaller() + tag, message, throwable)
-}
+fun i(message: String? = "", throwable: Throwable? = null, tag: String? = "") =
+ Log.i(getCaller() + tag, message, throwable)
 
-fun d(message: String? = "", throwable: Throwable? = null, tag: String? = ""): Unit {
- if (BuildConfig.DEBUG) Log.d(getCaller() + tag, message, throwable)
-}
+fun d(message: String? = "", throwable: Throwable? = null, tag: String? = "") =
+ Log.d(getCaller() + tag, message, throwable)
 
-fun e(message: String? = "", throwable: Throwable? = null, tag: String? = ""): Unit {
- if (BuildConfig.DEBUG) Log.e(getCaller() + tag, message, throwable)
-}
+fun e(message: String? = "", throwable: Throwable? = null, tag: String? = "") =
+ Log.e(getCaller() + tag, message, throwable)
 
-fun v(message: String? = "", throwable: Throwable? = null, tag: String? = ""): Unit {
- if (BuildConfig.DEBUG) Log.v(getCaller() + tag, message, throwable)
-}
+fun v(message: String? = "", throwable: Throwable? = null, tag: String? = "") =
+ Log.v(getCaller() + tag, message, throwable)
 
-fun w(message: String? = "", throwable: Throwable? = null, tag: String? = ""): Unit {
- if (BuildConfig.DEBUG) Log.w(getCaller() + tag, message, throwable)
-}
+fun w(message: String? = "", throwable: Throwable? = null, tag: String? = "") =
+ Log.w(getCaller() + tag, message, throwable)
 
-fun wtf(message: String? = "", throwable: Throwable? = null, tag: String? = ""): Unit {
- if (BuildConfig.DEBUG) Log.wtf(getCaller() + tag, message, throwable)
-}
+fun wtf(message: String? = "", throwable: Throwable? = null, tag: String? = "") =
+ Log.wtf(getCaller() + tag, message, throwable)
 
-fun <T>json(obj: T, throwable: Throwable? = null, tag: String? = ""): Unit {
+fun <T> json(obj: T, throwable: Throwable? = null, tag: String? = ""): Int {
  val json = if (obj is String) obj.trim() else gson.toJson(obj)
 
  try {
  when (json?.first()) {
- '{' -> Log.d(getCaller() + tag, JSONObject(json).toString(JSON_INDENTATION), throwable)
- '[' -> Log.d(getCaller() + tag, JSONArray(json).toString(JSON_INDENTATION), throwable)
- else -> Log.e(getCaller() + tag, "Invalid Json", throwable)
+ '{' -> return Log.d(getCaller() + tag, JSONObject(json).toString(JSON_INDENTATION), throwable)
+ '[' -> return Log.d(getCaller() + tag, JSONArray(json).toString(JSON_INDENTATION), throwable)
+ else -> return Log.e(getCaller() + tag, "Invalid Json", throwable)
  }
  } catch (e: JSONException) {
- Log.e(getCaller() + tag, "Invalid Json", e)
+ return Log.e(getCaller() + tag, "Invalid Json", e)
  }
 }
 
@@ -63,12 +55,11 @@ private fun getCaller(): String {
 
  // Find the last instance of the Log class in the current stack trace
  // and look for the calling Class in the next position
- if (cachedCallingClassIndex == -1)
- cachedCallingClassIndex = stackTrace.indexOfLast { it.className == "Log.LogExtensionsKt" } + 1
+ val callingClassIndex = stackTrace.indexOfLast { it.className == "Log.LogExtensionsKt" } + 1
 
  // Pull the calling class from the stack trace
- if (cachedCallingClassIndex != -1 && stackTrace.size >= cachedCallingClassIndex) {
- val callingClass = stackTrace[cachedCallingClassIndex]
+ if (callingClassIndex > 0 && stackTrace.size >= callingClassIndex) {
+ val callingClass = stackTrace[callingClassIndex]
 
  if (callingClass.className.split("").isNotEmpty()) {
  return "(" + callingClass.fileName + ":" + callingClass.lineNumber + ")"