Merge branch 'master' into pass_danger_js_path

Author: f-meloni

CHANGELOG.md

@@ -11,11 +11,16 @@
 
 -->
 ## Master
-- Update Kotlin to 1.4.10 [@gianluz] [#140](https://github.com/danger/kotlin/pull/140)
-- Migrate from moshi to kotlinx serialization [@gianluz] [#141] (https://github.com/danger/kotlin/pull/141)
+- Update Kotlin to 1.4.10 [@gianluz] - [#140](https://github.com/danger/kotlin/pull/140)
+- Migrate from moshi to kotlinx serialization [@gianluz] - [#141](https://github.com/danger/kotlin/pull/141)
 - Fix incorrect url in install.sh script and in Dockerfile [@davidbilik] - [#144](https://github.com/danger/kotlin/pull/144)
 - Road to 1.0 - Refactor project structure [@gianluz] - [#142](https://github.com/danger/kotlin/pull/142)
 - Handle danger-js custom paths with parameter `--danger-js-path` [@f-meloni] - [#153](https://github.com/danger/kotlin/pull/153)
+- Update Kotlin to 1.4.20 [@gianluz] - [#148](https://github.com/danger/kotlin/pull/148)
+- Fix gitlab defaults following kotlinx serialisation [@gianluz] - [#146](https://github.com/danger/kotlin/pull/146)
+- Road to 1.0 - Migrate from java.util.Date to kotlinx.datetime [@gianluz] - [#147](https://github.com/danger/kotlin/pull/147)
+- Fix typo in Github Milestone serialization [@doodeec] - [#151](https://github.com/danger/kotlin/pull/151)
+- Use fixed commit of danger/kotlin repository in install.sh script [@davidbilik]- [#152](https://github.com/danger/kotlin/pull/152)
 
 # 0.7.1
 

Dockerfile

@@ -15,7 +15,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x |  bash - && \
 # Install danger-kotlin globally
 COPY . /usr/local/_danger-kotlin
 RUN cd /usr/lib && \
-    wget -q https://github.com/JetBrains/kotlin/releases/download/v1.4.10/kotlin-compiler-1.4.10.zip && \
+    wget -q https://github.com/JetBrains/kotlin/releases/download/v1.4.20/kotlin-compiler-1.4.20.zip && \
     unzip kotlin-compiler-*.zip && \
     rm kotlin-compiler-*.zip && \
     cd /usr/local/_danger-kotlin && \

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/git/Git.kt

@@ -35,7 +35,7 @@ data class GitCommit(
     val author: GitCommitAuthor,
     val committer: GitCommitAuthor,
     val message: String,
-    val parents: List<String>? = null,
+    val parents: List<String> = listOf(),
     val url: String
 )
 

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/github/GitHub.kt

@@ -302,8 +302,8 @@ data class GitHubUser(
 
 @Serializable
 enum class GitHubMilestoneState {
-    @SerialName("close")
-    CLOSE,
+    @SerialName("closed")
+    CLOSED,
 
     @SerialName("open")
     OPEN,

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/gitlab/GitLab.kt

@@ -38,15 +38,15 @@ data class GitLabMergeRequest(
     @SerialName("allow_maintainer_to_push")
     val allowMaintainerToPush: Boolean = false,
     @SerialName("approvals_before_merge")
-    val approvalsBeforeMerge: Int?,
-    val assignee: GitLabUser?,
+    val approvalsBeforeMerge: Int = 0,
+    val assignee: GitLabUser? = null,
     val author: GitLabUser,
     @SerialName("changes_count")
     val changesCount: String,
     @SerialName("closed_at")
     val closedAt: Instant? = null,
     @SerialName("closed_by")
-    val closedBy: GitLabUser?,
+    val closedBy: GitLabUser? = null,
     val description: String,
     @SerialName("diff_refs")
     val diffRefs: GitLabDiffRefs,
@@ -69,7 +69,7 @@ data class GitLabMergeRequest(
     @SerialName("merged_at")
     val mergedAt: Instant? = null,
     @SerialName("merged_by")
-    val mergedBy: GitLabUser?,
+    val mergedBy: GitLabUser? = null,
     @SerialName("merge_when_pipeline_succeeds")
     val mergeOnPipelineSuccess: Boolean,
     val milestone: GitLabMilestone? = null,
@@ -78,7 +78,7 @@ data class GitLabMergeRequest(
     val projectId: String,
     val sha: String,
     @SerialName("should_remove_source_branch")
-    val shouldRemoveSourceBranch: Boolean? = null,
+    val shouldRemoveSourceBranch: Boolean? = false,
     @SerialName("source_branch")
     val sourceBranch: String,
     @SerialName("source_project_id")
@@ -108,9 +108,9 @@ data class GitLabMergeRequest(
 @Serializable
 data class GitLabMergeRequestTimeStats(
     @SerialName("human_time_estimate")
-    val humanTimeEstimate: Int?,
+    val humanTimeEstimate: Int = 0,
     @SerialName("human_time_spent")
-    val humanTimeSpent: Int?,
+    val humanTimeSpent: Int = 0,
     @SerialName("time_estimate")
     val timeEstimate: Int,
     @SerialName("total_time_spent")
@@ -202,7 +202,7 @@ enum class GitLabPipelineStatus {
 @Serializable
 data class GitLabUser(
     @SerialName("avatar_url")
-    val avatarUrl: String?,
+    val avatarUrl: String? = null,
     val id: Int,
     val name: String,
     val state: GitLabUserState,

danger-kotlin-library/src/test/kotlin/systems/danger/kotlin/KtxGitTest.kt

@@ -35,7 +35,7 @@ internal class GitKtxTest {
                 author = GitCommitAuthor("John Doe", "john@doe.com", "now"),
                 committer = GitCommitAuthor("John Doe", "john@doe.com", "now"),
                 message = "Random message",
-                parents = null,
+                parents = listOf(),
                 url = ""
             )
         )

danger-kotlin-library/src/test/kotlin/systems/danger/kotlin/models/github/GitHubParsingTests.kt

@@ -121,7 +121,7 @@ class GitHubParsingTests {
             expectedGitAuthor,
             expectedGitCommitter,
             "[Xcode] Updates for compatibility with Xcode 7.3.1.",
-            null,
+            listOf(),
             "https://api.github.com/repos/artsy/eidolon/git/commits/93ae30cf2aee4241c442fb3242543490998cffdb"
         )
         val expectedGitHubCommit = GitHubCommit(
@@ -210,6 +210,19 @@ class GitHubParsingTests {
         }
     }
 
+    @Test
+    fun testItParsesTheClosedMilestone() {
+        val dsl: DSL = Json {
+            ignoreUnknownKeys = true
+            isLenient = true
+        }.decodeFromString(JSONFiles.githubWithClosedMilestoneDangerJSON)
+        val github = dsl.danger.github
+
+        with(github.issue.milestone!!) {
+            assertEquals(GitHubMilestoneState.CLOSED, state)
+        }
+    }
+
     @Test
     fun testOnGitHubIsTrue() {
         assertEquals(true, dsl.danger.onGitHub)

danger-kotlin-library/src/test/kotlin/systems/danger/kotlin/utils/TestUtils.kt

@@ -19,6 +19,11 @@ object TestUtils {
         val githubWithSomeNullsAttributeDangerJSON by lazy {
             loadJSON("githubWithSomeNullsAttributeDangerJSON.json")
         }
+
+        val githubWithClosedMilestoneDangerJSON by lazy {
+            loadJSON("githubWithClosedMilestoneDangerJSON.json")
+        }
+
         val dangerBitBucketServerJSON by lazy {
             loadJSON("bitbucketServerDangerJSON.json")
         }