Merge pull request #52 from yshrsmz/dependencies

yshrsmz · Jun 11, 2021 · 33c37b6 · 33c37b6
2 parents 3203aae + f225357
commit 33c37b6
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,5 @@ secret.properties
 
 .envrc
 *-sec.asc
+
+*.hprof
diff --git a/CHANGELOGS.md b/CHANGELOGS.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.0] - 2021-06-11
+
+### Changed
+
+- Kotlin 1.5.10
+- Android Gradle Plugin 4.2.1
+- Gradle Wrapper 6.9
+
 ## [0.7.1] - 2021-06-09
 
 ### Changed

diff --git a/buildSrc/src/main/kotlin/com/codingfeline/buildkonfig/buildsrc/Config.kt b/buildSrc/src/main/kotlin/com/codingfeline/buildkonfig/buildsrc/Config.kt
@@ -1,23 +1,23 @@
 package com.codingfeline.buildkonfig.buildsrc
 
 object Versions {
-    const val compileSdk = 29
-    const val kotlin = "1.4.0"
-    const val dokka = "1.4.20"
+    const val compileSdk = 30
+    const val kotlin = "1.5.10"
+    const val dokka = "1.4.32"
     const val jvmTarget = "1.8"
-    const val benManesVersionsPlugin = "0.29.0"
-    const val gradle = "6.6"
+    const val benManesVersionsPlugin = "0.39.0"
+    const val gradle = "6.9"
 }
 
 object Dependencies {
-    const val androidPlugin = "com.android.tools.build:gradle:4.0.1"
+    const val androidPlugin = "com.android.tools.build:gradle:4.2.1"
     const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     const val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka}"
     const val gradleVersionsPlugin = "com.github.ben-manes:gradle-versions-plugin:${Versions.benManesVersionsPlugin}"
-    const val pluginPublishPlugin = "com.gradle.publish:plugin-publish-plugin:0.12.0"
-    const val mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.13.0"
+    const val pluginPublishPlugin = "com.gradle.publish:plugin-publish-plugin:0.15.0"
+    const val mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.14.2"
 
-    const val kotlinPoet = "com.squareup:kotlinpoet:1.6.0"
-    const val junit = "junit:junit:4.13"
-    const val truth = "com.google.truth:truth:1.0.1"
+    const val kotlinPoet = "com.squareup:kotlinpoet:1.8.0"
+    const val junit = "junit:junit:4.13.2"
+    const val truth = "com.google.truth:truth:1.1.3"
 }
diff --git a/...plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginFlavorTest.kt b/...plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginFlavorTest.kt
@@ -57,7 +57,7 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |}
             |$buildFileMPPConfig
@@ -87,7 +87,7 @@ class BuildKonfigPluginFlavorTest {
                 |import kotlin.String
                 |
                 |internal object BuildKonfig {
-                |  val value: String = "defaultValue"
+                |  public val stringValue: String = "defaultValue"
                 |}
                 |
             """.trimMargin()
@@ -113,10 +113,10 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   defaultConfigs("dev") {
-            |       buildConfigField 'STRING', 'value', 'devDefaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'devDefaultValue'
             |   }
             |}
             |$buildFileMPPConfig
@@ -142,7 +142,7 @@ class BuildKonfigPluginFlavorTest {
 
         val commonResult = File(buildDir, "commonMain/com/example/BuildKonfig.kt")
         Truth.assertThat(commonResult.readText())
-            .contains("val value: String = \"devDefaultValue\"")
+            .contains("val stringValue: String = \"devDefaultValue\"")
 
         val jvmResult = File(buildDir, "jvmMain/com/example/BuildKonfig.kt")
         Truth.assertThat(jvmResult.exists()).isFalse()
@@ -164,13 +164,13 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   defaultConfigs("dev") {
-            |       buildConfigField 'STRING', 'value', 'devDefaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'devDefaultValue'
             |   }
             |   defaultConfigs("release") {
-            |       buildConfigField 'STRING', 'value', 'releaseDefaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'releaseDefaultValue'
             |   }
             |}
             |$buildFileMPPConfig
@@ -196,7 +196,7 @@ class BuildKonfigPluginFlavorTest {
 
         val commonResult = File(buildDir, "commonMain/com/example/BuildKonfig.kt")
         Truth.assertThat(commonResult.readText())
-            .contains("val value: String = \"releaseDefaultValue\"")
+            .contains("val stringValue: String = \"releaseDefaultValue\"")
 
         val jvmResult = File(buildDir, "jvmMain/com/example/BuildKonfig.kt")
         Truth.assertThat(jvmResult.exists()).isFalse()
@@ -218,14 +218,14 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   defaultConfigs("dev") {
-            |       buildConfigField 'STRING', 'value', 'devDefaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'devDefaultValue'
             |   }
             |   targetConfigs {
             |       jvm {
-            |           buildConfigField 'STRING', 'value', 'jvmDefaultValue'
+            |           buildConfigField 'STRING', 'stringValue', 'jvmDefaultValue'
             |       }
             |   }
             |}
@@ -273,14 +273,14 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   defaultConfigs("dev") {
-            |       buildConfigField 'STRING', 'value', 'devDefaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'devDefaultValue'
             |   }
             |   targetConfigs("dev") {
             |       js {
-            |           buildConfigField 'STRING', 'value', 'devJsValue'
+            |           buildConfigField 'STRING', 'stringValue', 'devJsValue'
             |       }
             |   }
             |}
@@ -328,7 +328,7 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigNullableField 'STRING', 'value', 'defaultValue'
+            |       buildConfigNullableField 'STRING', 'stringValue', 'defaultValue'
             |       buildConfigNullableField 'INT', 'intValue', '10'
             |   }
             |}
@@ -355,8 +355,7 @@ class BuildKonfigPluginFlavorTest {
 
         val commonResult = File(buildDir, "commonMain/com/example/BuildKonfig.kt")
         Truth.assertThat(commonResult.readText()).apply {
-            contains("String?")
-            contains("defaultValue")
+            contains("stringValue: String? = \"defaultValue\"")
             contains("intValue: Int? = 10")
         }
     }
@@ -371,7 +370,7 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigNullableField 'STRING', 'value', null
+            |       buildConfigNullableField 'STRING', 'stringValue', null
             |       buildConfigNullableField 'INT', 'intValue', null
             |   }
             |}
@@ -398,7 +397,7 @@ class BuildKonfigPluginFlavorTest {
 
         val commonResult = File(buildDir, "commonMain/com/example/BuildKonfig.kt")
         Truth.assertThat(commonResult.readText()).apply {
-            contains("value: String? = null")
+            contains("stringValue: String? = null")
             contains("intValue: Int? = null")
         }
     }
@@ -413,16 +412,16 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'key', 'defaultValue'
             |   }
             |   targetConfigs {
             |       js {
-            |           buildConfigField 'STRING', 'value', 'defaultJsValue'
+            |           buildConfigField 'STRING', 'key', 'defaultJsValue'
             |       }
             |   }
             |   targetConfigs("dev") {
             |       js {
-            |           buildConfigField 'STRING', 'value', 'devJsValue'
+            |           buildConfigField 'STRING', 'key', 'devJsValue'
             |       }
             |   }
             |}
@@ -470,16 +469,16 @@ class BuildKonfigPluginFlavorTest {
             |   packageName = "com.example"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   targetConfigs {
             |       js {
-            |           buildConfigField 'STRING', 'value', 'defaultJsValue'
+            |           buildConfigField 'STRING', 'stringValue', 'defaultJsValue'
             |       }
             |   }
             |   targetConfigs("dev") {
             |       js {
-            |           buildConfigField 'STRING', 'value', 'devJsValue'
+            |           buildConfigField 'STRING', 'stringValue', 'devJsValue'
             |       }
             |   }
             |}
@@ -528,7 +527,7 @@ class BuildKonfigPluginFlavorTest {
             |   objectName = "AwesomeConfig"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |}
             |$buildFileMPPConfig
@@ -569,11 +568,11 @@ class BuildKonfigPluginFlavorTest {
             |   objectName = "AwesomeConfig"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   targetConfigs {
             |       js {
-            |         buildConfigField 'STRING', 'value', 'jsValue'
+            |         buildConfigField 'STRING', 'stringValue', 'jsValue'
             |       }
             |   }
             |}
@@ -627,7 +626,7 @@ class BuildKonfigPluginFlavorTest {
             |   exposeObjectWithName = "AwesomeConfig"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |}
             |$buildFileMPPConfig
@@ -670,11 +669,11 @@ class BuildKonfigPluginFlavorTest {
             |   exposeObjectWithName = "AwesomeConfig"
             |
             |   defaultConfigs {
-            |       buildConfigField 'STRING', 'value', 'defaultValue'
+            |       buildConfigField 'STRING', 'stringValue', 'defaultValue'
             |   }
             |   targetConfigs {
             |       js {
-            |         buildConfigField 'STRING', 'value', 'jsValue'
+            |         buildConfigField 'STRING', 'stringValue', 'jsValue'
             |       }
             |   }
             |}

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -5,18 +5,18 @@ buildscript {
     repositories {
         // Use 'gradle install' to install latest
         mavenLocal()
-//        mavenCentral()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10'
         classpath 'com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:+'
     }
 }
 
 kotlin {
     jvm {}
-    js {
+    js(IR) {
         browser()
         nodejs()
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,5 @@ secret.properties

		.envrc
		*-sec.asc

		*.hprof