diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
index e73994175a8..ba67f700ba1 100644
--- a/.github/workflows/PR.yml
+++ b/.github/workflows/PR.yml
@@ -19,8 +19,6 @@ jobs:
             job: gradle-plugin-tests
           - os: windows-latest
             job: gradle-plugin-integrations
-          - os: macOS-latest
-            job: gradle-plugin-tests
           - os: macOS-latest
             job: gradle-plugin-integrations
 
@@ -73,6 +71,11 @@ jobs:
       - name: Run ios tests
         if: matrix.os == 'macOS-latest' && matrix.job == 'test'
         run: ./gradlew iosX64Test --stacktrace
+      - name: Build the sample
+        if: matrix.os == 'macOS-latest' && matrix.job == 'gradle-plugin-tests'
+        run: |
+          cd sample
+          ./gradlew build
 
       - name: Bundle the build report
         if: failure()
diff --git a/build.gradle b/build.gradle
index 9f86ad85fc4..d54d3433fdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
       url 'https://jitpack.io'
     }
     maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
-    maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
+    maven { url "https://cache-redirector.jetbrains.com/intellij-dependencies" }
   }
 
   dependencies {
@@ -53,7 +53,7 @@ allprojects {
     google()
     jcenter()
     maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
-    maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
+    maven { url "https://cache-redirector.jetbrains.com/intellij-dependencies" }
   }
 
   tasks.withType(Test).configureEach {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 0c7c40d0b9e..691191f92a6 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -6,7 +6,6 @@ ext.versions = [
     androidxSqlite: '2.1.0',
     minSdk: 14,
     schemaCrawler: '14.16.04.01-java7',
-    sqldelight: '1.3.0-SNAPSHOT',
     stately: '1.1.1',
     sqliter: '0.7.0',
     testhelp: '0.4.0',
diff --git a/sample/android/build.gradle b/sample/android/build.gradle
index 0cd979cd628..af54f686e46 100644
--- a/sample/android/build.gradle
+++ b/sample/android/build.gradle
@@ -4,17 +4,12 @@ apply plugin: 'org.jetbrains.kotlin.android'
 android {
   compileSdkVersion versions.compileSdk
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
-  }
-
   lintOptions {
     textOutput 'stdout'
   }
 
   defaultConfig {
-    minSdkVersion 14
+    minSdkVersion 21
     targetSdkVersion versions.compileSdk
 
     applicationId 'com.example.sqldelight.hockey'
@@ -41,9 +36,9 @@ android {
 }
 
 dependencies {
-  implementation project(':sample:common')
+  implementation project(':common')
 
   implementation deps.androidx.recyclerView
 
-  implementation "com.squareup.sqldelight:android-driver:${versions.sqldelight}"
+  implementation "com.squareup.sqldelight:android-driver"
 }
diff --git a/sample/build.gradle b/sample/build.gradle
new file mode 100644
index 00000000000..c5ff397cb8b
--- /dev/null
+++ b/sample/build.gradle
@@ -0,0 +1,47 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+buildscript {
+  apply from: "$rootDir/../gradle/dependencies.gradle"
+
+  repositories {
+    mavenCentral()
+    google()
+    maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
+    maven { url "https://cache-redirector.jetbrains.com/intellij-dependencies" }
+  }
+
+  dependencies {
+    classpath deps.plugins.kotlin
+    classpath deps.plugins.android
+    classpath "com.squareup.sqldelight:gradle-plugin"
+  }
+}
+
+apply from: "$rootDir/../gradle/dependencies.gradle"
+
+
+allprojects {
+  repositories {
+    mavenCentral()
+    google()
+    maven { url 'https://dl.bintray.com/kotlin/kotlinx' }
+  }
+
+  plugins.withId("org.jetbrains.kotlin.jvm") {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
+  plugins.withId("com.android.library") {
+    extensions.getByName("android").compileOptions {
+      sourceCompatibility JavaVersion.VERSION_1_8
+      targetCompatibility JavaVersion.VERSION_1_8
+    }
+  }
+
+  tasks.withType(KotlinCompile).configureEach {
+    kotlinOptions {
+      jvmTarget = "1.8"
+    }
+  }
+}
\ No newline at end of file
diff --git a/sample/common/build.gradle b/sample/common/build.gradle
index 248033995be..1ea0708fe06 100644
--- a/sample/common/build.gradle
+++ b/sample/common/build.gradle
@@ -8,6 +8,7 @@ sqldelight {
   HockeyDb {
     packageName = "com.example.sqldelight.hockey"
   }
+  linkSqlite = true
 }
 
 version = 1.0
@@ -26,12 +27,11 @@ kotlin {
   jvm()
   sourceSets.jvmTest.dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-test-junit'
-    implementation "com.squareup.sqldelight:sqlite-driver:${versions.sqldelight}"
+    implementation "com.squareup.sqldelight:sqlite-driver"
   }
 
   // Configure web.
-  // Disable temporarily
-  /*js {
+  js {
     useCommonJs()
     browser {
       testTask {
@@ -46,10 +46,10 @@ kotlin {
     implementation npm('dateformat', '3.0.3')
   }
   sourceSets.jsTest.dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-test-js'
-    implementation deps.kotlin.coroutines.js
-    implementation project(':drivers:sqljs-driver')
-  }*/
+    implementation "org.jetbrains.kotlin:kotlin-test-js"
+    implementation deps.kotlin.coroutines.core
+    implementation "com.squareup.sqldelight:sqljs-driver"
+  }
 
   // Configure iOS.
   def sdkName = System.getenv("SDK_NAME")
@@ -59,8 +59,9 @@ kotlin {
     iosX64("ios")
   }
   sourceSets.iosMain.dependencies {
-    implementation "com.squareup.sqldelight:native-driver:${versions.sqldelight}"
+    implementation "com.squareup.sqldelight:native-driver"
   }
+
   cocoapods {
     summary = "Common core for SQLDelight sample."
     homepage = "https://github.com/cashapp/sqldelight/tree/master/sample/common"
diff --git a/sample/common/common.podspec b/sample/common/common.podspec
index d97610a9860..234133a07d5 100644
--- a/sample/common/common.podspec
+++ b/sample/common/common.podspec
@@ -8,11 +8,13 @@ Pod::Spec.new do |spec|
     spec.summary                  = 'Common core for SQLDelight sample.'
 
     spec.static_framework         = true
-    spec.vendored_frameworks      = "build/cocoapods/framework/#{spec.name}.framework"
-    spec.libraries                = "c++", 'sqlite3'
+    spec.vendored_frameworks      = "build/cocoapods/framework/common.framework"
+    spec.libraries                = "c++", "sqlite3"
     spec.module_name              = "#{spec.name}_umbrella"
 
-            
+                
+
+                
 
     spec.pod_target_xcconfig = {
         'KOTLIN_TARGET[sdk=iphonesimulator*]' => 'ios_x64',
@@ -32,7 +34,7 @@ Pod::Spec.new do |spec|
             :script => <<-SCRIPT
                 set -ev
                 REPO_ROOT="$PODS_TARGET_SRCROOT"
-                "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" :sample:common:syncFramework \
+                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" :common:syncFramework \
                     -Pkotlin.native.cocoapods.target=$KOTLIN_TARGET \
                     -Pkotlin.native.cocoapods.configuration=$CONFIGURATION \
                     -Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \
@@ -41,4 +43,4 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-end
+end
\ No newline at end of file
diff --git a/sample/common/src/iosMain/kotlin/com/example/sqldelight/hockey/data/Date.kt b/sample/common/src/iosMain/kotlin/com/example/sqldelight/hockey/data/Date.kt
index b38c5affe58..08c629ab6a6 100644
--- a/sample/common/src/iosMain/kotlin/com/example/sqldelight/hockey/data/Date.kt
+++ b/sample/common/src/iosMain/kotlin/com/example/sqldelight/hockey/data/Date.kt
@@ -4,6 +4,8 @@ import com.squareup.sqldelight.ColumnAdapter
 import platform.Foundation.NSCalendar
 import platform.Foundation.NSDate
 import platform.Foundation.NSDateComponents
+import platform.Foundation.dateWithTimeIntervalSince1970
+import platform.Foundation.timeIntervalSince1970
 import kotlin.math.floor
 
 actual class Date internal constructor(internal val nsDate: NSDate) {
diff --git a/sample/gradle.properties b/sample/gradle.properties
new file mode 100644
index 00000000000..fe7b5ed3fa9
--- /dev/null
+++ b/sample/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+kotlin.js.compiler=ir
diff --git a/sample/gradle/wrapper/gradle-wrapper.jar b/sample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..e708b1c023e
Binary files /dev/null and b/sample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..442d9132ea3
--- /dev/null
+++ b/sample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/sample/gradlew b/sample/gradlew
new file mode 100755
index 00000000000..4f906e0c811
--- /dev/null
+++ b/sample/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/sample/gradlew.bat b/sample/gradlew.bat
new file mode 100644
index 00000000000..ac1b06f9382
--- /dev/null
+++ b/sample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/sample/iosApp/Podfile.lock b/sample/iosApp/Podfile.lock
index 7db75910a48..cd4ea9a059b 100644
--- a/sample/iosApp/Podfile.lock
+++ b/sample/iosApp/Podfile.lock
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../common"
 
 SPEC CHECKSUMS:
-  common: 204e29558feb3830a4a5413d892d19373567e19d
+  common: a0a2e18aad33e21e51a53e6f70e1e7aa366fa145
 
 PODFILE CHECKSUM: 2b262158413d54974309509332564887c6610d16
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.10.0
diff --git a/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/astrong.xcuserdatad/UserInterfaceState.xcuserstate b/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/astrong.xcuserdatad/UserInterfaceState.xcuserstate
index 6ee2533f5a8..bb4a1b1f4a0 100644
Binary files a/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/astrong.xcuserdatad/UserInterfaceState.xcuserstate and b/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/astrong.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/sample/settings.gradle b/sample/settings.gradle
new file mode 100644
index 00000000000..c88b9beea1c
--- /dev/null
+++ b/sample/settings.gradle
@@ -0,0 +1,17 @@
+rootProject.name = "sample"
+
+include ':android'
+include ':common'
+include ':web'
+
+includeBuild('..') {
+  dependencySubstitution {
+    substitute module("com.squareup.sqldelight:sqlite-driver") with project(":drivers:sqlite-driver")
+    substitute module("com.squareup.sqldelight:android-driver") with project(":drivers:android-driver")
+    substitute module("com.squareup.sqldelight:native-driver") with project(":drivers:native-driver")
+    substitute module("com.squareup.sqldelight:sqljs-driver") with project(":drivers:sqljs-driver")
+    substitute module("com.squareup.sqldelight:runtime") with project(":runtime")
+    substitute module("com.squareup.sqldelight:runtime-jvm") with project(":runtime")
+    substitute module("com.squareup.sqldelight:gradle-plugin") with project(":sqldelight-gradle-plugin")
+  }
+}
\ No newline at end of file
diff --git a/sample/web/build.gradle b/sample/web/build.gradle
index 34952a4ceb2..e882e058aa2 100644
--- a/sample/web/build.gradle
+++ b/sample/web/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'org.jetbrains.kotlin.js'
 
 kotlin {
-
-  target {
+  js {
     browser {
+      binaries.executable()
       testTask {
         useMocha {
           timeout = "5s"
@@ -11,14 +11,13 @@ kotlin {
       }
     }
   }
+}
 
-  sourceSets["main"].dependencies {
-    implementation project(':sample:common')
-    implementation project(':drivers:sqljs-driver')
-    implementation "org.jetbrains.kotlinx:kotlinx-html-js:0.6.12"
-    implementation npm("copy-webpack-plugin", "5.1.1")
-  }
-  sourceSets["test"].dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-test-js'
-  }
+dependencies {
+  implementation project(':common')
+  implementation "com.squareup.sqldelight:sqljs-driver"
+  implementation "org.jetbrains.kotlinx:kotlinx-html-js:0.7.2"
+  implementation npm("copy-webpack-plugin", "5.1.1")
+
+  testImplementation 'org.jetbrains.kotlin:kotlin-test-js'
 }
diff --git a/sample/web/src/main/kotlin/com/example/sqldelight/hockey/App.kt b/sample/web/src/main/kotlin/com/example/sqldelight/hockey/App.kt
index af99dee03ea..2d369696e67 100644
--- a/sample/web/src/main/kotlin/com/example/sqldelight/hockey/App.kt
+++ b/sample/web/src/main/kotlin/com/example/sqldelight/hockey/App.kt
@@ -3,6 +3,7 @@ package com.example.sqldelight.hockey
 import com.example.sqldelight.hockey.data.Db
 import com.example.sqldelight.hockey.data.getInstance
 import com.example.sqldelight.hockey.platform.defaultFormatter
+import kotlinx.browser.document
 import kotlinx.html.dom.create
 import kotlinx.html.table
 import kotlinx.html.tbody
@@ -10,7 +11,6 @@ import kotlinx.html.td
 import kotlinx.html.th
 import kotlinx.html.thead
 import kotlinx.html.tr
-import kotlin.browser.document
 
 fun main() {
   Db.getInstance().then { db ->
diff --git a/settings.gradle b/settings.gradle
index 0ffbaf09962..a97bf6a9eef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,14 +12,6 @@ include ':extensions:coroutines-extensions'
 include ':extensions:rxjava2-extensions'
 include ':extensions:rxjava3-extensions'
 include ':runtime'
-
-//Removed until build is split
-//include ':sample:android'
-//include ':sample:common'
-
-//Removed because of JS issue
-//include ':sample:web'
-
 include ':sqldelight-compiler'
 include ':sqldelight-compiler:integration-tests'
 include ':sqldelight-gradle-plugin'