Skip to content
This repository has been archived by the owner on Dec 3, 2024. It is now read-only.

Commit

Permalink
replace dependencies with (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
niusounds authored Mar 24, 2022
1 parent e7c29f9 commit 62d57a0
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 18 deletions.
7 changes: 3 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.android.app)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down Expand Up @@ -39,10 +39,9 @@ android {

dependencies {
implementation(project(":cronet-engine"))
implementation("io.ktor:ktor-client-core:1.6.7")
implementation(libs.ktor.core)
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0")

implementation("com.google.android.gms:play-services-cronet:18.0.1")
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation("com.google.android.material:material:1.5.0")
Expand Down
7 changes: 0 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "7.1.1" apply false
id("com.android.library") version "7.1.1" apply false
id("org.jetbrains.kotlin.android") version "1.6.10" apply false
id("org.jetbrains.dokka") version "1.6.10" apply false
}

tasks.create<Delete>("clean") {
delete(rootProject.buildDir)
}
10 changes: 5 additions & 5 deletions cronet-engine/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.android.lib)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.dokka)
id("maven-publish")
id("org.jetbrains.dokka")
}

group = "com.github.niusounds"
Expand Down Expand Up @@ -38,8 +38,8 @@ android {
}

dependencies {
implementation("io.ktor:ktor-client-core:1.6.7")
api("com.google.android.gms:play-services-cronet:18.0.1")
implementation(libs.ktor.core)
api(libs.cronet)
}

afterEvaluate {
Expand Down
20 changes: 20 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[versions]
kotlin = "1.6.10"
# https://github.com/ktorio/ktor/releases
ktor = "1.6.8"
# https://mvnrepository.com/artifact/com.google.android.gms/play-services-cronet?repo=google
cronet = "18.0.1"

## Build scripts
agp = "7.2.0-beta04"
dokka = "1.6.10"

[libraries]
ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
cronet = { module = "com.google.android.gms:play-services-cronet", version.ref = "cronet" }

[plugins]
android-app = { id = "com.android.application", version.ref = "agp" }
android-lib = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Feb 04 22:07:56 JST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 62d57a0

Please sign in to comment.