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 #190

Browse source 
190: Sort build dependencies r=msfjarvis a=msfjarvis



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

5
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 = "7.0-rc-1" gradleVersion = "6.8.3"
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
distributionSha256Sum = "a52ad940d4dd2abdee5c7f4486788b6b3859daa7e260c08c1c18eec8cba297e6" distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7"
} }
} }
@ -36,7 +36,6 @@ internal fun Project.configureForAllProjects() {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
jcenter { content { includeGroup("org.jetbrains.compose.*") } }
maven("https://dl.bintray.com/kotlin/kotlinx") { maven("https://dl.bintray.com/kotlin/kotlinx") {
name = "KotlinX Bintray" name = "KotlinX Bintray"
content { content {

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

@ -6,8 +6,8 @@
private const val DAGGER_HILT_VERSION = "2.33-beta" private const val DAGGER_HILT_VERSION = "2.33-beta"
object Plugins { object Plugins {
const val android = "com.android.tools.build:gradle:7.0.0-alpha12" const val android = "com.android.tools.build:gradle:7.0.0-alpha13"
const val lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha12" 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"

3
common/build.gradle.kts
View file

@ -26,7 +26,6 @@ kotlin {
sourceSets { sourceSets {
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
implementation(compose.runtime)
implementation(Dependencies.AndroidX.browser) implementation(Dependencies.AndroidX.browser)
} }
} }
@ -38,8 +37,6 @@ kotlin {
} }
} }
val jvmMain by getting { dependencies { implementation(compose.runtime) } }
val androidTest by getting { dependencies { implementation(kotlin("test-junit")) } } val androidTest by getting { dependencies { implementation(kotlin("test-junit")) } }
val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) } } val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) } }

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=a52ad940d4dd2abdee5c7f4486788b6b3859daa7e260c08c1c18eec8cba297e6 distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

1
settings.gradle.kts
View file

@ -2,6 +2,7 @@ rootProject.name = "Claw"
include(":app", ":api", ":common", ":database", ":desktop") include(":app", ":api", ":common", ":database", ":desktop")
enableFeaturePreview("GRADLE_METADATA")
pluginManagement { pluginManagement {
repositories { repositories {
google() google()