diff --git a/.idea/.gitignore b/.idea/.gitignore index bca4ac9c..144bff51 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -2,3 +2,4 @@ /shelf/ /workspace.xml /artifacts/ +/gradle.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 1e428de2..00000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c9d35c77..3a2c3a1e 100644 --- a/app/build.gradle.kts +++ b/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" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 34b2a0eb..8d04cdaa 100644 --- a/buildSrc/build.gradle.kts +++ b/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") } diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 14b1bd1c..c01492a5 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/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 { kotlinOptions { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index c58456da..7bb321f4 100644 --- a/common/build.gradle.kts +++ b/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 { diff --git a/database/src/commonMain/sqldelight/dev/msfjarvis/lobsters/data/local/SavedPost.sq b/database/src/commonMain/sqldelight/dev/msfjarvis/lobsters/data/local/SavedPost.sq index 1d88f39b..b1977c08 100644 --- a/database/src/commonMain/sqldelight/dev/msfjarvis/lobsters/data/local/SavedPost.sq +++ b/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 NOT NULL + tags TEXT AS List NOT NULL ); insertOrReplacePost: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dccca7b9..4dd20ce0 100644 --- a/gradle/libs.versions.toml +++ b/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"