diff --git a/build.gradle.kts b/build.gradle.kts
index 8c365d1..0bdd264 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 buildscript {
     dependencies {
         // workaround for KMP plugin to find android classes
-        classpath("com.android.tools.build:gradle:7.0.0-beta03")
+        classpath("com.android.tools.build:gradle:7.0.0-beta04")
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 34d8833..70cfb4a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true
 android.useAndroidX=true
 android.enableJetifier=true
 spotlessVersion=4.0.1
-agpVersion=7.0.0-beta03
+agpVersion=7.0.0-beta04
 ktlintVersion=9.2.1
-kotlinVersion=1.5.10
+kotlinVersion=1.5.20
 kotlin.mpp.stability.nowarn=true
diff --git a/sqlitebindings-api/build.gradle.kts b/sqlitebindings-api/build.gradle.kts
index 21a17c3..af186af 100644
--- a/sqlitebindings-api/build.gradle.kts
+++ b/sqlitebindings-api/build.gradle.kts
@@ -33,8 +33,5 @@ kotlin {
                 implementation(kotlin("stdlib"))
             }
         }
-        all {
-            languageSettings.enableLanguageFeature("InlineClasses")
-        }
     }
 }
diff --git a/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/AuthResult.kt b/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/AuthResult.kt
index 0494024..ae0b4da 100644
--- a/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/AuthResult.kt
+++ b/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/AuthResult.kt
@@ -15,8 +15,11 @@
  */
 package com.birbit.sqlite3
 
+import kotlin.jvm.JvmInline
+
 // see https://www.sqlite.org/c3ref/c_deny.html
-inline class AuthResult(val value: Int) {
+@JvmInline
+value class AuthResult(val value: Int) {
     companion object {
         val OK = AuthResult(0)
         val DENY = AuthResult(1)
diff --git a/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ColumnType.kt b/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ColumnType.kt
index 6222cff..e50719c 100644
--- a/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ColumnType.kt
+++ b/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ColumnType.kt
@@ -15,8 +15,11 @@
  */
 package com.birbit.sqlite3
 
+import kotlin.jvm.JvmInline
+
 // see https://www.sqlite.org/c3ref/c_blob.html
-inline class ColumnType(val value: Int) {
+@JvmInline
+value class ColumnType(val value: Int) {
     companion object {
         val INTEGER = ColumnType(1)
         val FLOAT = ColumnType(2)
diff --git a/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ResultCode.kt b/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ResultCode.kt
index 202c3b2..3527bd3 100644
--- a/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ResultCode.kt
+++ b/sqlitebindings-api/src/commonMain/kotlin/com/birbit/sqlite3/ResultCode.kt
@@ -15,8 +15,11 @@
  */
 package com.birbit.sqlite3
 
+import kotlin.jvm.JvmInline
+
 // commonized sqlite APIs to build the rest in common, or most at least
-inline class ResultCode(val value: Int) {
+@JvmInline
+value class ResultCode(val value: Int) {
     companion object {
         val OK = ResultCode(0) /* Successful result */
         val ERROR = ResultCode(1) /* Generic error */