Merge pull request #33 from anthonycr/dev

Version 1.1.1
anthonycr · Apr 9, 2018 · 9378199 · 9378199
2 parents 4d9e57d + 771df55
commit 9378199
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ jdk:
   - oraclejdk8
 android:
   components:
-    - build-tools-27.0.2
+    - build-tools-27.0.3
     - android-27
   licenses:
     - 'android-sdk-license-.+'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+Version 1.1.1 *(2018-04-08)*
+----------------------------
+- Fixed warnings caused by logging on latest versions of the Kotlin compiler by changing logging behavior.
+
 Version 1.1.0 *(2018-01-15)*
 ----------------------------
 - Added `mezzanine.projectPath` annotation processing argument (specified in gradle) which is used to determine the project root.

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ allprojects {
 ##### Android/Java
 ```groovy
 dependencies {
-  def mezzanineVersion = '1.1.0'
+  def mezzanineVersion = '1.1.1'
   compile "com.anthonycr.mezzanine:mezzanine:$mezzanineVersion"
   annotationProcessor "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion"
 }
@@ -48,7 +48,7 @@ android {
 apply plugin: 'kotlin-kapt'
 
 dependencies {
-  def mezzanineVersion = '1.1.0'
+  def mezzanineVersion = '1.1.1'
   compile "com.anthonycr.mezzanine:mezzanine:$mezzanineVersion"
   kapt "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion"
 }
@@ -67,7 +67,7 @@ plugins {
 }
 
 dependencies {
-    def mezzanineVersion = '1.1.0'
+    def mezzanineVersion = '1.1.1'
     compile "com.anthonycr.mezzanine:mezzanine:$mezzanineVersion"
     apt "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion"
 }

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlinVersion = '1.2.10'
+    ext.kotlinVersion = '1.2.31'
     ext.dokkaVersion = '0.9.15'
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
     }
@@ -26,11 +26,11 @@ task clean(type: Delete) {
 
 subprojects {
     group = 'com.anthonycr.mezzanine'
-    version = '1.1.0'
+    version = '1.1.1'
 }
 
 ext {
-    versionName = '1.1.0'
+    versionName = '1.1.1'
 
     publishGroupId = 'com.anthonycr.mezzanine'
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 26 19:29:46 EDT 2017
+#Wed Apr 04 21:37:57 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/mezzanine-compiler/src/main/java/com/anthonycr/mezzanine/MezzanineProcessor.kt b/mezzanine-compiler/src/main/java/com/anthonycr/mezzanine/MezzanineProcessor.kt
@@ -42,7 +42,7 @@ class MezzanineProcessor : AbstractProcessor() {
 
         val projectRoot = processingEnv.options[OPTION_PROJECT_PATH] ?: Paths.get("").toAbsolutePath().toString()
 
-        MessagerUtils.reportInfo("Starting Mezzanine processing")
+        MessagerUtils.reportInfo("Starting processing")
 
         MezzanineElementSource(roundEnvironment)
                 .createElementStream()

diff --git a/mezzanine-compiler/src/main/java/com/anthonycr/mezzanine/utils/MessagerUtils.kt b/mezzanine-compiler/src/main/java/com/anthonycr/mezzanine/utils/MessagerUtils.kt
@@ -26,6 +26,6 @@ object MessagerUtils {
      *
      * @param message the message to log.
      */
-    fun reportInfo(message: String) = messager.printMessage(Kind.NOTE, message)
+    fun reportInfo(message: String) = println("Mezzanine: $message")
 
 }
diff --git a/mezzanine-compiler/src/test/java/com/anthonycr/mezzanine/utils/MessagerUtilsTest.kt b/mezzanine-compiler/src/test/java/com/anthonycr/mezzanine/utils/MessagerUtilsTest.kt
@@ -15,8 +15,8 @@ class MessagerUtilsTest {
         MessagerUtils.reportError(element, "test error")
     }
 
-    @Test(expected = UninitializedPropertyAccessException::class)
-    internal fun `reportInfo fails when uninitialized`() {
+    @Test
+    internal fun `reportInfo does not fail when uninitialized`() {
         MessagerUtils.reportInfo("test message")
     }
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.2'
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.anthonycr.mezzanine.sample"
         minSdkVersion 16