msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-17 16:47:01 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #195

Browse source 
195: Bump AGP and Gradle r=msfjarvis a=msfjarvis

bors try

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2021-04-10 16:06:03 +00:00 • committed by GitHub
commit 1abf793e19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle.kts
View file

@ -21,9 +21,9 @@ android {
dependencies { dependencies {
kapt(Dependencies.AndroidX.Hilt.daggerCompiler) kapt(Dependencies.AndroidX.Hilt.daggerCompiler)
implementation(project(":api")) implementation(projects.api)
implementation(project(":common")) implementation(projects.common)
implementation(project(":database")) implementation(projects.database)
implementation(compose.foundation) implementation(compose.foundation)
implementation(compose.material) implementation(compose.material)
implementation(Dependencies.AndroidX.appCompat) implementation(Dependencies.AndroidX.appCompat)

1
buildSrc/build.gradle.kts
View file

@ -28,7 +28,6 @@ dependencies {
implementation(Plugins.android) implementation(Plugins.android)
implementation(Plugins.hilt) implementation(Plugins.hilt)
implementation(Plugins.jsemver) implementation(Plugins.jsemver)
implementation(Plugins.lintModel)
implementation(Plugins.kotlin) implementation(Plugins.kotlin)
implementation(Plugins.shot) implementation(Plugins.shot)
implementation(Plugins.sqldelight) implementation(Plugins.sqldelight)

4
buildSrc/src/main/java/BaseProjectConfig.kt
View file

@ -25,9 +25,9 @@ internal fun Project.configureForRootProject() {
// register task for cleaning the build directory in the root project // register task for cleaning the build directory in the root project
tasks.register<Delete>("clean") { delete(rootProject.buildDir) } tasks.register<Delete>("clean") { delete(rootProject.buildDir) }
tasks.withType<Wrapper> { tasks.withType<Wrapper> {
gradleVersion = "6.8.3" gradleVersion = "7.0"
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7" distributionSha256Sum = "81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd"
} }
} }

3
buildSrc/src/main/java/Dependencies.kt
View file

@ -6,8 +6,7 @@
private const val DAGGER_HILT_VERSION = "2.34-beta" private const val DAGGER_HILT_VERSION = "2.34-beta"
object Plugins { object Plugins {
const val android = "com.android.tools.build:gradle:7.0.0-alpha13" const val android = "com.android.tools.build:gradle:7.0.0-alpha14"
const val lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha13"
const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}"
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32" const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0" const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0"

10
desktop/build.gradle.kts
View file

@ -10,16 +10,14 @@ plugins {
repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
kotlin { kotlin {
jvm { jvm()
withJava()
}
sourceSets { sourceSets {
named("jvmMain") { named("jvmMain") {
dependencies { dependencies {
implementation(compose.desktop.currentOs) implementation(compose.desktop.currentOs)
implementation(project(":api")) implementation(projects.api)
implementation(project(":common")) implementation(projects.common)
implementation(project(":database")) implementation(projects.database)
implementation(compose.material) implementation(compose.material)
implementation(Dependencies.Kotlin.Coroutines.jvmCore) implementation(Dependencies.Kotlin.Coroutines.jvmCore)
implementation(Dependencies.ThirdParty.kamel) implementation(Dependencies.ThirdParty.kamel)

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7 distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

9
settings.gradle.kts
View file

@ -1,8 +1,13 @@
rootProject.name = "Claw" rootProject.name = "Claw"
include(":app", ":api", ":common", ":database", ":desktop") include(":api")
include(":app")
include(":common")
include(":database")
include(":desktop")
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
enableFeaturePreview("GRADLE_METADATA")
pluginManagement { pluginManagement {
repositories { repositories {
google() google()