Merge #230

230: Sync dependency versions r=msfjarvis a=msfjarvis

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

.idea/.gitignore

@@ -2,3 +2,4 @@
 /shelf/
 /workspace.xml
 /artifacts/
+/gradle.xml

.idea/gradle.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.sdkman/candidates/gradle/current" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/api" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/buildSrc" />
-            <option value="$PROJECT_DIR$/common" />
-            <option value="$PROJECT_DIR$/database" />
-            <option value="$PROJECT_DIR$/desktop" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

app/build.gradle.kts

@@ -12,8 +12,6 @@ plugins {
   `core-library-desugaring`
 }
 
-repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
-
 android {
   defaultConfig {
     applicationId = "dev.msfjarvis.lobsters"

buildSrc/build.gradle.kts

@@ -6,8 +6,6 @@ repositories {
   maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev")
 }
 
-kotlinDslPluginOptions { experimentalWarning.set(false) }
-
 gradlePlugin {
   plugins {
     register("lobsters") {
@@ -27,11 +25,11 @@ gradlePlugin {
 
 dependencies {
   implementation("com.android.tools.build:gradle:7.0.0-alpha14")
-  implementation("com.google.dagger:hilt-android-gradle-plugin:2.34.1-beta")
+  implementation("com.google.dagger:hilt-android-gradle-plugin:2.35")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
-  implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.4.32-1.0.0-alpha07")
+  implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.4.32-1.0.0-alpha08")
   implementation("com.github.zafarkhaja:java-semver:0.9.0")
   implementation("com.karumi:shot:5.10.3")
-  implementation("com.squareup.sqldelight:gradle-plugin:1.4.4")
-  implementation("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build183")
+  implementation("com.squareup.sqldelight:gradle-plugin:1.5.0")
+  implementation("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build184")
 }

buildSrc/src/main/java/BaseProjectConfig.kt

@@ -11,6 +11,7 @@ import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.gradle.api.tasks.wrapper.Wrapper
+import org.gradle.kotlin.dsl.maven
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.repositories
 import org.gradle.kotlin.dsl.withType
@@ -35,6 +36,19 @@ internal fun Project.configureForAllProjects() {
   repositories {
     mavenCentral()
     google()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") {
+      name = "JetBrains Space Compose Repository"
+      content {
+        includeGroup("org.jetbrains.compose.animation")
+        includeGroup("org.jetbrains.compose.compiler")
+        includeGroup("org.jetbrains.compose.desktop")
+        includeGroup("org.jetbrains.compose.foundation")
+        includeGroup("org.jetbrains.compose.material")
+        includeGroup("org.jetbrains.compose.runtime")
+        includeGroup("org.jetbrains.compose.ui")
+        includeGroup("org.jetbrains.skiko")
+      }
+    }
   }
   tasks.withType<KotlinCompile> {
     kotlinOptions {

common/build.gradle.kts

@@ -5,8 +5,6 @@ plugins {
   `lobsters-plugin`
 }
 
-repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
-
 // workaround for https://youtrack.jetbrains.com/issue/KT-43944
 android {
   configurations {

database/src/commonMain/sqldelight/dev/msfjarvis/lobsters/data/local/SavedPost.sq

@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS SavedPost(
   commentsUrl TEXT NOT NULL,
   submitterName TEXT NOT NULL,
   submitterAvatarUrl TEXT NOT NULL,
-  tags TEXT as List<String> NOT NULL
+  tags TEXT AS List<String> NOT NULL
 );
 
 insertOrReplacePost:

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ sqldelightGradlePlugin = { module = "com.squareup.sqldelight:gradle-plugin", ver
 # Kotlin dependencies
 kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
-kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jvm", version.ref = "coroutines" }
+kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutines" }
 
 # AndroidX dependencies
 androidx-appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"