Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.kotlin
deepai.key
xcuserdata
firebase_service_account_key.json
Expand Down Expand Up @@ -27,4 +28,4 @@ keystore.properties
api-*.json
*.db
.terraform
.terraform.lock.hcl
.terraform.lock.hcl
12 changes: 1 addition & 11 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,11 @@ plugins {

dependencies {
implementation(platform(libs.google.cloud.bom))
implementation(platform(libs.firebase.bom))
implementation(libs.google.cloud.storage)
implementation(libs.plugin.kotlin)
implementation(libs.plugin.android.application)
implementation(libs.plugin.apollo)
implementation(libs.plugin.ksp)
implementation(libs.plugin.kmp.nativecoroutines)
implementation(libs.plugin.kotlin.serialization)
implementation(libs.plugin.kotlin.spring)
implementation(libs.plugin.spring.boot)
implementation(libs.plugin.appengine)
implementation(libs.plugin.kmmbridge)
implementation(libs.plugin.google.services)
implementation(libs.plugin.firebase.crashlytics)
implementation(libs.plugin.wire)
implementation(libs.plugin.apollo.execution)
implementation(libs.jib.core)
implementation(libs.google.cloud.storage)
implementation(libs.google.cloud.run)
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pluginManagement {
mavenCentral()
google()
gradlePluginPortal()
maven("https://storage.googleapis.com/martin-maven/m2/")
maven("https://storage.googleapis.com/apollo-snapshots/m2/")
}
}
}
16 changes: 0 additions & 16 deletions buildSrc/src/main/kotlin/Dependencies.kt

This file was deleted.

56 changes: 0 additions & 56 deletions buildSrc/src/main/kotlin/PlayStoreScreenshotTask.kt

This file was deleted.

51 changes: 0 additions & 51 deletions buildSrc/src/main/kotlin/ReadmeScreenshotTask.kt

This file was deleted.

40 changes: 0 additions & 40 deletions buildSrc/src/main/kotlin/landing.kt

This file was deleted.

12 changes: 0 additions & 12 deletions buildSrc/src/main/kotlin/options.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import com.android.build.gradle.BaseExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions

private fun Int.toJavaVersion(): String = when(this) {
Expand All @@ -33,12 +29,4 @@ fun Project.configureCompilerOptions(jvmVersion: Int = 11) {
it.languageVersion.set(JavaLanguageVersion.of(17))
}
}

extensions.findByName("android")?.apply{
this as BaseExtension
compileOptions {
it.sourceCompatibility = JavaVersion.toVersion(jvmVersion.toJavaVersion())
it.targetCompatibility = JavaVersion.toVersion(jvmVersion.toJavaVersion())
}
}
}
1 change: 0 additions & 1 deletion data/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.kotlin.plugin.spring")
id("org.jetbrains.kotlin.plugin.serialization")
}

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.stability.nowarn=true
kotlin.mpp.androidSourceSetLayoutVersion=2

#ksp.useKSP2=true
ksp.allow.all.target.configuration=true
Loading