Update Anko to Kotlin Beta Candidate

Author: yanex

.idea/runConfigurations/Collect_android_jar.xml

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '0.14.449'
+    ext.kotlin_version = '1.0.0-beta-1038'
     repositories {
         jcenter()
     }

.idea/runConfigurations/Generate_tests.xml

@@ -1,6 +1,6 @@
 POM_ARTEFACT_GROUP=org.jetbrains.anko
 POM_ARTEFACT_ID=anko-%ARTIFACT_VERSION
-POM_ARTEFACT_VERSION=0.7.1
+POM_ARTEFACT_VERSION=0.7.2
 POM_PACKAGING=jar
 
 projectUrl=https://github.com/JetBrains/anko

.idea/runConfigurations/Hierarchy_collector.xml

@@ -32,7 +32,7 @@ class Writer(private val renderFacade: RenderFacade) {
 
     fun write() {
         val versionType = config.getTargetArtifactType()
-        AnkoFile.values().forEach { file ->
+        values.forEach { file ->
             if (config[file] && versionType in file.types && file.shouldBeWritten(config)) {
                 write(file)
             }
@@ -120,7 +120,7 @@ class Writer(private val renderFacade: RenderFacade) {
 
         PrintWriter(file).useIt {
             if (config.generatePackage && generatePackage) {
-                val facadeFilename = config.version.toCamelCase('-') + subsystem.name().toLowerCase().toCamelCase()
+                val facadeFilename = config.version.toCamelCase('-') + subsystem.name.toLowerCase().toCamelCase()
                 println("@file:JvmMultifileClass")
                 println("@file:JvmName(\"${facadeFilename}Kt\")")
                 println("package ${config.outputPackage}\n")

dsl/props/mvn/build.gradle

@@ -28,8 +28,8 @@ import java.io.File
 abstract class AnkoConfiguration {
     open val indent: String = "    "
 
-    open val files: MutableSet<AnkoFile> = hashSetOf(*AnkoFile.values())
-    open val tunes: MutableSet<ConfigurationTune> = hashSetOf(*ConfigurationTune.values())
+    open val files: MutableSet<AnkoFile> = hashSetOf(*AnkoFile.values)
+    open val tunes: MutableSet<ConfigurationTune> = hashSetOf(*ConfigurationTune.values)
 
     open val generateStaticFiles: Boolean = true
 
@@ -53,7 +53,7 @@ abstract class AnkoConfiguration {
     abstract val sourceManager: SourceManager
     abstract val templateManager: TemplateManager
 
-    operator fun get(option: ConfigurationOption): Boolean = option in tunes || option in files
+    operator fun get(option: ConfigurationOption): Boolean = tunes.containsRaw(option) || files.containsRaw(option)
 
     abstract fun getOutputFile(ankoFile: AnkoFile): File
 

dsl/props/mvn/gradle.properties

@@ -46,7 +46,7 @@ enum class AnkoFile(
     val types: Set<TargetArtifactType> = type.toSet()
 
     val filename: String by lazy {
-        val name = name()
+        val name = name
         val extension = if (name.endsWith("_JAVA")) ".java" else ".kt"
         name.substringBeforeLast("_JAVA").toCamelCase() + extension
     }

dsl/src/org/jetbrains/android/anko/Writer.kt

@@ -53,9 +53,9 @@ class ListenerGenerator : Generator<ListenerElement> {
 
         val rawName = setter.method.name
         //delete "set" ("add") end "Listener" parts of String
-        val name = rawName.substring("set".length()).dropLast("Listener".length()).decapitalize()
+        val name = rawName.substring("set".length).dropLast("Listener".length).decapitalize()
 
-        return when (methods?.size() ?: 0) {
+        return when (methods?.size ?: 0) {
             1 -> { // It is a simple listener, with just one method
                 val method = methods!![0]
                 val methodWithClass = MethodNodeWithClass(listener, method)
@@ -76,5 +76,5 @@ class ListenerGenerator : Generator<ListenerElement> {
         }
     }
 
-    private fun String.dropLast(n: Int) = if (n >= length()) "" else substring(0, length() - n)
+    private fun String.dropLast(n: Int) = if (n >= length) "" else substring(0, length - n)
 }

dsl/src/org/jetbrains/android/anko/config/AnkoConfiguration.kt

@@ -51,13 +51,13 @@ class PropertyGenerator : Generator<PropertyElement> {
             val settersList = setters.get(property.setterIdentifier) ?: listOf()
 
             val (best, others) = settersList.partition {
-                it.method.args.size() == 1 && it.method.args[0] == getter.method.returnType
+                it.method.args.size == 1 && it.method.args[0] == getter.method.returnType
             }
 
             existingProperties.add(property.setterIdentifier)
             PropertyElement(property.name, getter, best + others)
         }
-        val propertyWithoutGetters = setters.values().map { setters ->
+        val propertyWithoutGetters = setters.values.map { setters ->
             val property = setters.first().toProperty()
 
             val id = property.setterIdentifier

dsl/src/org/jetbrains/android/anko/config/AnkoFile.kt

@@ -29,7 +29,7 @@ fun GenerationState.extractLayoutParams(viewGroup: ClassNode): LayoutElement? {
 
         val generateMethod = viewGroup.methods.firstOrNull { method ->
             method.name == "generateLayoutParams"
-                    && method.args.size() == 1
+                    && method.args.size == 1
                     && method.args[0].internalName == "android/util/AttributeSet"
         } ?: return findForParent()
 

dsl/src/org/jetbrains/android/anko/generator/ListenerGenerator.kt

@@ -28,7 +28,7 @@ class InterfaceWorkaroundsRenderer(config: AnkoConfiguration) : Renderer(config)
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.INTERFACE_WORKAROUNDS_JAVA)
 
-    override fun processElements(state: GenerationState) = StringBuilder {
+    override fun processElements(state: GenerationState) = StringBuilder().apply {
         val interfaces = state[InterfaceWorkaroundsGenerator::class.java].toList()
 
         append(render("interface_workarounds") {

dsl/src/org/jetbrains/android/anko/generator/PropertyGenerator.kt

@@ -33,7 +33,7 @@ class LayoutRenderer(config: AnkoConfiguration) : Renderer(config), ViewConstruc
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.LAYOUTS)
 
-    override fun processElements(state: GenerationState) = StringBuilder {
+    override fun processElements(state: GenerationState) = StringBuilder().apply {
         append("private val defaultInit: Any.() -> Unit = {}").appendln().appendln()
         state[LayoutGenerator::class.java].forEach { append(renderLayout(it)) }
     }.toString()

dsl/src/org/jetbrains/android/anko/generator/layoutParamsUtils.kt

@@ -33,7 +33,7 @@ class ListenerRenderer(config: AnkoConfiguration) : Renderer(config) {
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.LISTENERS)
 
-    override fun processElements(state: GenerationState) = StringBuilder {
+    override fun processElements(state: GenerationState) = StringBuilder().apply {
         val renderedClasses = hashSetOf<String>()
 
         for (listener in state[ListenerGenerator::class.java]) {

dsl/src/org/jetbrains/android/anko/render/InterfaceWorkaroundsRenderer.kt

@@ -30,7 +30,7 @@ class PropertyRenderer(config: AnkoConfiguration) : Renderer(config) {
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.PROPERTIES)
 
-    override fun processElements(state: GenerationState) = StringBuilder {
+    override fun processElements(state: GenerationState) = StringBuilder().apply {
         state[PropertyGenerator::class.java].forEach {
             append(renderProperty(it))
         }
@@ -61,7 +61,7 @@ class PropertyRenderer(config: AnkoConfiguration) : Renderer(config) {
 
         val nullability = if (nullable) "?" else ""
 
-        val otherSetters = if (property.setters.size() > 1) property.setters.drop(1) else listOf()
+        val otherSetters = if (property.setters.size > 1) property.setters.drop(1) else listOf()
 
         if (property.getter != null) {
             return buffer {
@@ -88,7 +88,7 @@ class PropertyRenderer(config: AnkoConfiguration) : Renderer(config) {
     {
         if (otherSetters.isNotEmpty() && supportsResourceSetter(returnType)) {
             val resourceSetter = otherSetters.firstOrNull {
-                it.method.args.size() == 1 && (it.method.args[0].className == "int")
+                it.method.args.size == 1 && (it.method.args[0].className == "int")
             }
 
             if (resourceSetter != null) {

dsl/src/org/jetbrains/android/anko/render/LayoutRenderer.kt

@@ -28,7 +28,7 @@ class ServiceRenderer(config: AnkoConfiguration) : Renderer(config) {
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.SERVICES)
 
-    override fun processElements(state: GenerationState) = StringBuilder {
+    override fun processElements(state: GenerationState) = StringBuilder().apply {
         append(render("services") {
             "services" % seq(state[ServiceGenerator::class.java]) {
                 "name" % it.service.simpleName.decapitalize()

dsl/src/org/jetbrains/android/anko/render/ListenerRenderer.kt

@@ -26,7 +26,7 @@ class SqlParserHelperRenderer(config: AnkoConfiguration) : Renderer(config) {
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.SQL_PARSER_HELPERS)
 
-    override fun processElements(state: GenerationState) = StringBuilder {
+    override fun processElements(state: GenerationState) = StringBuilder().apply {
         for (i in 1..22) {
             val types = (1..i).map { "T$it" }.joinToString(", ")
             val args = (1..i).map { "columns[${it - 1}] as T$it" }.joinToString(", ")

dsl/src/org/jetbrains/android/anko/render/PropertyRenderer.kt

@@ -34,7 +34,7 @@ interface ViewConstructorUtils {
             ctxName: String,
             argumentNames: Boolean = false
     ): String {
-        if (constructors.size() != AVAILABLE_VIEW_CONSTRUCTORS.size()) throw IllegalArgumentException("Invalid constructors list")
+        if (constructors.size != AVAILABLE_VIEW_CONSTRUCTORS.size) throw IllegalArgumentException("Invalid constructors list")
 
         return if (argumentNames) {
             when {

dsl/src/org/jetbrains/android/anko/render/ServiceRenderer.kt

@@ -27,12 +27,12 @@ import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import java.util.*
 
-class ViewRenderer(config: AnkoConfiguration) : AbstractViewRenderer(config) {
+internal class ViewRenderer(config: AnkoConfiguration) : AbstractViewRenderer(config) {
     override fun processElements(state: GenerationState) =
             renderViews(state[ViewGenerator::class.java]) { it.fqName }
 }
 
-class ViewGroupRenderer(config: AnkoConfiguration) : AbstractViewRenderer(config) {
+internal class ViewGroupRenderer(config: AnkoConfiguration) : AbstractViewRenderer(config) {
     override fun processElements(state: GenerationState) =
             renderViews(state[ViewGroupGenerator::class.java]) { "_" + it.simpleName }
 }
@@ -46,7 +46,7 @@ class ViewFactoryClass(val config: AnkoConfiguration, val suffix: String) {
     fun render(): String {
         if (entries.isEmpty()) return ""
 
-        return StringBuilder {
+        return StringBuilder().apply {
             appendln("object $fullName {")
             entries.forEach { append(config.indent).appendln(it) }
             appendln("}").appendln()
@@ -60,12 +60,12 @@ private abstract class AbstractViewRenderer(
 
     override val renderIf: Array<ConfigurationOption> = arrayOf(AnkoFile.VIEWS, ConfigurationTune.HELPER_CONSTRUCTORS)
 
-    protected fun renderViews(views: Iterable<ViewElement>, nameResolver: (ClassNode) -> String): String = StringBuilder {
+    protected fun renderViews(views: Iterable<ViewElement>, nameResolver: (ClassNode) -> String): String = StringBuilder().apply {
         val renderViews = config[AnkoFile.VIEWS]
         val renderHelperConstructors = config[ConfigurationTune.HELPER_CONSTRUCTORS]
 
         val factoryClass = ViewFactoryClass(config, this@AbstractViewRenderer.javaClass.simpleName.replace("Renderer", ""))
-        val functions = StringBuilder {
+        val functions = StringBuilder().apply {
             for (view in views.filter { !it.clazz.isAbstract }) {
                 if (renderViews) renderView(view.clazz, view.isContainer, nameResolver(view.clazz), factoryClass)
 
@@ -126,7 +126,7 @@ private abstract class AbstractViewRenderer(
         }
     }
 
-    private fun renderHelperConstructors(view: ViewElement, factoryClass: ViewFactoryClass) = StringBuilder {
+    private fun renderHelperConstructors(view: ViewElement, factoryClass: ViewFactoryClass) = StringBuilder().apply {
         val className = view.fqName
 
         val (className21, functionName) = handleTintedView(view.clazz, className)
@@ -171,10 +171,10 @@ private abstract class AbstractViewRenderer(
         return properties.map { property ->
             val methodName = "set" + property.name.capitalize()
             val methods = view.allMethods.filter {
-                it.name == methodName && it.args.size() == 1 && it.args[0].fqName.endsWith(property.type)
+                it.name == methodName && it.args.size == 1 && it.args[0].fqName.endsWith(property.type)
             }
 
-            when (methods.size()) {
+            when (methods.size) {
                 0 -> throw RuntimeException("Can't find a method $methodName for helper constructor ${view.fqName}($properties)")
                 1 -> {}
                 else -> throw RuntimeException("There are several methods $methodName for helper constructor ${view.fqName}($properties)")
@@ -186,7 +186,7 @@ private abstract class AbstractViewRenderer(
 
     private fun handleTintedView(view: ClassNode, className: String): Pair<String?, String> {
         val tinted = view.isTinted()
-        val className21 = if (tinted) className.substring(APP_COMPAT_VIEW_PREFIX.length()) else null
+        val className21 = if (tinted) className.substring(APP_COMPAT_VIEW_PREFIX.length) else null
         val functionName = if (tinted) "tinted$className21" else view.simpleName.decapitalize()
         return className21 to functionName
     }

dsl/src/org/jetbrains/android/anko/render/SqlParserHelperRenderer.kt

@@ -34,7 +34,7 @@ class SourceManager(private val provider: SourceProvider) {
         object : VoidVisitorAdapter<Any>() {
             override fun visit(method: MethodDeclaration, arg: Any?) {
                 if (done) return
-                if (methodName != method.name || argumentJavaTypes.size() != method.parameters.size()) return
+                if (methodName != method.name || argumentJavaTypes.size != method.parameters.size) return
                 if (method.getParentClassName() != className) return
 
                 val parameters = method.parameters

dsl/src/org/jetbrains/android/anko/render/viewConstructorUtils.kt

@@ -41,7 +41,7 @@ class AndroidHomeSourceProvider(version: Int) : SourceProvider {
         val packageDir = File(baseDir, packageName.replace('.', '/'))
         if (!packageDir.exists()) return null
 
-        val filename = fqName.substring(packageName.length() + 1).substringBefore('.') + ".java"
+        val filename = fqName.substring(packageName.length + 1).substringBefore('.') + ".java"
         val file = File(packageDir, filename)
         if (!file.exists()) return null
 

dsl/src/org/jetbrains/android/anko/render/viewRenderers.kt

@@ -72,10 +72,10 @@ class Buffer(private val indentString: String, indent: Int = 0, val init: Buffer
     }
 
     val size: Int
-        get() = builder.length()
+        get() = builder.length
 
     val isEmpty: Boolean
-        get() = builder.length() == 0
+        get() = builder.length == 0
 
     override fun toString() = builder.toString()
 

dsl/src/org/jetbrains/android/anko/sources/SourceManager.kt

@@ -22,7 +22,7 @@ import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InnerClassNode
 import org.objectweb.asm.tree.MethodNode
 
-internal data class MethodNodeWithClass(var clazz: ClassNode, val method: MethodNode) {
+data class MethodNodeWithClass(var clazz: ClassNode, val method: MethodNode) {
     val identifier = "${clazz.fqName}#${method.name}"
 }
 

dsl/src/org/jetbrains/android/anko/sources/sourceProviders.kt

@@ -110,7 +110,7 @@ class ClassTree : Iterable<ClassNode>{
     }
 }
 
-internal class ClassTreeIterator(var next: ClassTreeNode) : Iterator<ClassNode> {
+class ClassTreeIterator(var next: ClassTreeNode) : Iterator<ClassNode> {
 
     var nodeQueue: Queue<ClassTreeNode> = ArrayDeque(next.children)
 

dsl/src/org/jetbrains/android/anko/utils/Buffer.kt

@@ -78,7 +78,7 @@ internal fun MethodNodeWithClass.processArguments(
         nameIndex += arg.size
     }
 
-    if ( buffer.length() >= 2) buffer.delete(buffer.length() - 2, buffer.length())
+    if ( buffer.length >= 2) buffer.delete(buffer.length - 2, buffer.length)
     return buffer.toString()
 }
 
@@ -118,15 +118,15 @@ internal fun MethodNodeWithClass.formatArgumentsNames(config: AnkoConfiguration)
 
 
 fun MethodNode.isGetter(): Boolean {
-    val isNonBooleanGetter = name.startsWith("get") && name.length() > 3 && Character.isUpperCase(name.charAt(3))
-    val isBooleanGetter = name.startsWith("is") && name.length() > 2 && Character.isUpperCase(name.charAt(2))
+    val isNonBooleanGetter = name.startsWith("get") && name.length > 3 && Character.isUpperCase(name[3])
+    val isBooleanGetter = name.startsWith("is") && name.length > 2 && Character.isUpperCase(name[2])
 
     return (isNonBooleanGetter || isBooleanGetter) && args.isEmpty() && !returnType.isVoid && isPublic
 }
 
 internal fun MethodNode.isNonListenerSetter(): Boolean {
-    val isSetter = name.startsWith("set") && name.length() > 3 && Character.isUpperCase(name.charAt(3))
-    return isSetter && !(isListenerSetter() || name.endsWith("Listener")) && args.size() == 1 && isPublic
+    val isSetter = name.startsWith("set") && name.length > 3 && Character.isUpperCase(name[3])
+    return isSetter && !(isListenerSetter() || name.endsWith("Listener")) && args.size == 1 && isPublic
 }
 
 internal val MethodNode.isConstructor: Boolean

dsl/src/org/jetbrains/android/anko/utils/ClassInfo.kt

@@ -93,7 +93,7 @@ internal fun parseGenericMethodSignature(signature: String): GenericMethodSignat
 
             override fun visitParameterType(): SignatureVisitor {
                 val parameterType = GenericTypeImpl()
-                val param = ValueParameter(valueParameters.size(), parameterType)
+                val param = ValueParameter(valueParameters.size, parameterType)
                 valueParameters.add(param)
                 return GenericTypeParser(parameterType)
             }