Merge pull request #45 from icerockdev/develop

Release 0.10.1

Author: Alex009

README.md

@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.9.2")
+    implementation("dev.icerock:mobile-multiplatform:0.10.1")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
     implementation("com.android.tools.build:gradle:4.1.1")
 }

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "dev.icerock"
-version = "0.10.0"
+version = "0.10.1"
 
 repositories {
     mavenCentral()

src/main/kotlin/dev/icerock/gradle/LogOutputStream.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle
+
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.logging.Logger
+import java.io.OutputStream
+
+internal class LogOutputStream(
+    private val logger: Logger,
+    private val level: LogLevel
+) : OutputStream() {
+    private var mem: StringBuffer = StringBuffer()
+
+    override fun write(byte: Int) {
+        if (byte.toChar() == '\n') {
+            flush()
+            return
+        }
+
+        mem = mem.append(byte.toChar())
+    }
+
+    override fun flush() {
+        logger.log(level, mem.toString())
+        mem = StringBuffer()
+    }
+}

src/main/kotlin/dev/icerock/gradle/tasks/CompileCocoaPod.kt

@@ -12,8 +12,8 @@ import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-import org.gradle.internal.io.LineBufferingOutputStream
-import org.gradle.internal.io.TextStream
+import dev.icerock.gradle.LogOutputStream
+import org.gradle.api.logging.LogLevel
 import java.io.File
 
 open class CompileCocoaPod : DefaultTask() {
@@ -77,37 +77,11 @@ open class CompileCocoaPod : DefaultTask() {
             project.logger.lifecycle("cocoapod build cmd: $it")
         }
 
-        val errOut = LineBufferingOutputStream(
-            object : TextStream {
-                override fun endOfStream(failure: Throwable?) {
-                    if (failure != null) {
-                        project.logger.error(failure.message, failure)
-                    }
-                }
-
-                override fun text(text: String) {
-                    project.logger.error(text)
-                }
-            }
-        )
-        val stdOut = LineBufferingOutputStream(
-            object : TextStream {
-                override fun endOfStream(failure: Throwable?) {
-                    if (failure != null) {
-                        project.logger.info(failure.message, failure)
-                    }
-                }
-
-                override fun text(text: String) {
-                    project.logger.info(text)
-                }
-            }
-        )
         val result = project.exec {
             workingDir = podsProject
             commandLine = cmdLine.toList()
-            standardOutput = stdOut
-            errorOutput = errOut
+            standardOutput = LogOutputStream(project.logger, LogLevel.INFO)
+            errorOutput = LogOutputStream(project.logger, LogLevel.ERROR)
         }
         project.logger.lifecycle("xcodebuild result is ${result.exitValue}")
         result.assertNormalExitValue()