diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81ace41..0d3dfb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.5.0] - 2022-07-13
+### Changed
+- Upgrade to Kotlin 1.7.10 (#126)
+
 ## [0.4.1] - 2022-06-04
 ### Changed
 - Add `watchosX64` target (#123)
diff --git a/build.gradle.kts b/build.gradle.kts
index 06a7b8f..9b21bcf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,8 @@
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
-    kotlin("multiplatform") version "1.6.21"
+    kotlin("multiplatform") version "1.7.10"
     id("org.jetbrains.dokka") version "0.9.18"
     id("maven-publish")
     id("signing")
@@ -209,9 +210,17 @@ val generateProjDirValTask = tasks.register("generateProjectDirectoryVal") {
 kotlin.sourceSets.named("commonTest") {
     this.kotlin.srcDir(projectDirGenRoot)
 }
+
 // Ensure this runs before any test compile task
 tasks.withType<AbstractCompile>().configureEach {
     if (name.toLowerCase().contains("test")) {
         dependsOn(generateProjDirValTask)
     }
 }
+
+tasks.withType<AbstractKotlinCompileTool<*>>().configureEach {
+    if (name.toLowerCase().contains("test")) {
+        dependsOn(generateProjDirValTask)
+    }
+}
+
diff --git a/gradle.properties b/gradle.properties
index c9974f1..3c80f93 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ kotlin.code.style=official
 kotlin.incremental=true
 
 GROUP=com.benasher44
-VERSION=0.4.1
+VERSION=0.5.0
 
 POM_URL=https://github.com/benasher44/uuid/
 POM_SCM_URL=https://github.com/benasher44/uuid/
@@ -20,5 +20,4 @@ POM_NAME=UUID
 POM_DESCRIPTION=A Kotlin multiplatform implementation of a v4 RFC4122 UUID
 
 
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true