Skip to content

Commit

Permalink
[feature] 1.迁移到 version catelog
Browse files Browse the repository at this point in the history
  • Loading branch information
heyanlin committed Aug 23, 2023
1 parent 0026bff commit 9ac4619
Show file tree
Hide file tree
Showing 27 changed files with 308 additions and 321 deletions.
124 changes: 35 additions & 89 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import com.heyanle.buildsrc.implementation
import com.heyanle.buildsrc.project

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp") version "1.8.21-1.0.11"
alias(build.plugins.android.application)
alias(build.plugins.kotlin.android)
alias(build.plugins.ksp)
}

android {
Expand Down Expand Up @@ -80,7 +80,7 @@ android {
viewBinding = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.7"
kotlinCompilerExtensionVersion = compose.versions.compiler.get()
}

}
Expand All @@ -89,113 +89,59 @@ android {

dependencies {

implementation(androidx.bundles.core)
androidTestImplementation (androidx.bundles.test.core)

implementation("com.github.bumptech.glide:glide:${Version.glide}")
implementation(androidx.bundles.room.impl)
implementation(androidx.room.paging)
ksp(androidx.room.compiler)
testImplementation(androidx.room.testing)
androidTestImplementation(androidx.room.testing)

implementation("com.github.heyanLE.okkv2:okkv2-mmkv:${Version.okkv2}")
implementation(androidx.medie)

implementation("com.squareup.okhttp3:okhttp:${Version.okhttp3}")
implementation("com.squareup.okhttp3:logging-interceptor:${Version.okhttp3}")
implementation(androidx.google.material)

implementation("androidx.core:core-ktx:${Version.androidx_core_ktx}")
implementation("androidx.appcompat:appcompat:${Version.androidx_appcompat}")
implementation("com.google.android.material:material:${Version.google_material}")
implementation("androidx.activity:activity-ktx:${Version.androidx_activity_ktx}")
implementation("androidx.fragment:fragment-ktx:${Version.androidx_fragment_ktx}")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Version.androidx_lifecycle_runtime_ktx}")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Version.androidx_lifecycle_view_model}")
implementation("androidx.test.ext:junit-ktx:1.1.5")
implementation(androidx.webkit)

implementation("androidx.preference:preference-ktx:${Version.androidx_preference}")
implementation(androidx.window)

debugImplementation( "com.squareup.leakcanary:leakcanary-android:${Version.leakcanary}")
implementation(androidx.paging.compose)
implementation(androidx.paging.runtime.ktx)

implementation("androidx.paging:paging-runtime-ktx:${Version.paging}")
implementation("androidx.paging:paging-compose:${Version.paging}")
implementation("com.github.easybangumiorg:EasyPlayer2:${Version.easy_player}")
// implementation("loli.ball:easyplayer2:1.0.0.test") // for local maven test only
implementation(libs.bundles.okhttp3)
implementation(libs.bundles.cling)
implementation(libs.bundles.appcenter)

// implementation(platform("androidx.compose:compose-bom:${Version.compose_bom}"))
implementation("androidx.compose.ui:ui:${Version.compose_ui}")
implementation("androidx.compose.ui:ui-graphics:${Version.compose_ui}")
implementation("androidx.compose.ui:ui-tooling-preview:${Version.compose_ui}")
implementation("androidx.compose.material3:material3:${Version.compose_material3}")
implementation("androidx.compose.material:material-icons-core:${Version.compose_material}")
implementation("androidx.compose.material:material-icons-extended:${Version.compose_material}")
implementation("androidx.compose.runtime:runtime-livedata:${Version.compose_runtime}")
implementation("androidx.compose.animation:animation:${Version.compose_animation}")
implementation("androidx.compose.animation:animation-core:${Version.compose_animation}")
implementation("androidx.compose.animation:animation-graphics:${Version.compose_animation}")
implementation("androidx.compose.foundation:foundation:${Version.compose_foundation}")
implementation("androidx.compose.foundation:foundation-layout:${Version.compose_foundation}")
implementation(libs.jsoup)
implementation(libs.gson)

debugImplementation(libs.leakcanary)

implementation("androidx.window:window:${Version.androidx_window}")
implementation("androidx.compose.material3:material3-window-size-class:${Version.compose_material3}")
implementation(libs.glide)
implementation(libs.okkv2)

debugImplementation("androidx.compose.ui:ui-tooling:${Version.compose_ui}")
debugImplementation("androidx.compose.ui:ui-test-manifest:${Version.compose_ui}")
androidTestImplementation ("androidx.compose.ui:ui-test-junit4:${Version.compose_ui}")
testImplementation(libs.junit)

implementation("com.google.accompanist:accompanist-navigation-animation:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-systemuicontroller:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-pager:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-pager-indicators:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-swiperefresh:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-insets:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-insets-ui:${Version.accompanist}")
implementation("com.google.accompanist:accompanist-flowlayout:${Version.accompanist}")

implementation("androidx.navigation:navigation-compose:${Version.navigation_compose}")

implementation("io.coil-kt:coil-compose:${Version.coil}")
implementation("io.coil-kt:coil-gif:${Version.coil}")

// implementation("com.google.android.exoplayer:exoplayer:${Version.exoplayer}")
// implementation("com.google.android.exoplayer:extension-rtmp:${Version.exoplayer}")

implementation("androidx.media:media:${Version.media}")

implementation("androidx.room:room-runtime:${Version.androidx_room}")
implementation("androidx.room:room-ktx:${Version.androidx_room}")
implementation("androidx.room:room-paging:${Version.androidx_room}")
implementation("androidx.room:room-common:${Version.androidx_room}")

testImplementation("androidx.room:room-testing:${Version.androidx_room}")
androidTestImplementation("androidx.room:room-testing:${Version.androidx_room}")

ksp("androidx.room:room-compiler:${Version.androidx_room}")

implementation("com.microsoft.appcenter:appcenter-analytics:${Version.app_center}")
implementation("com.microsoft.appcenter:appcenter-crashes:${Version.app_center}")
implementation("com.microsoft.appcenter:appcenter-distribute:${Version.app_center}")

implementation("com.google.code.gson:gson:${Version.gson}")

implementation("org.jsoup:jsoup:${Version.jsoup}")

implementation("androidx.webkit:webkit:${Version.androidx_webkit}")

implementation("org.apache.commons:commons-text:${Version.commons_text}")

implementation("org.fourthline.cling:cling-core:${Version.cling}")
implementation("org.fourthline.cling:cling-support:${Version.cling}")

implementation("org.burnoutcrew.composereorderable:reorderable:${Version.compose_lazy_reorder}")
implementation(libs.easyplayer2)
implementation(libs.accompanist.systemuicontroller)
implementation(libs.navigtion.compose)
implementation(libs.coil.compose)
implementation(libs.coil.gif)
implementation(libs.commons.text)
implementation(libs.bundles.cling)
implementation(libs.compose.reorderable)

implementation(project(":easy-dlna"))
implementation(project(":easy-crasher"))
implementation(project(":easy-i18n"))
implementation(project(":injekt"))
implementation(project(":extension:extension-core"))
implementation(com.heyanle.buildsrc.SourceExtension.extensionApi)


implementation(extension.extension.api)

testImplementation ("junit:junit:${Version.junit}")

androidTestImplementation ("androidx.test.ext:junit:${Version.androidx_test_junit}")
androidTestImplementation ("androidx.test.espresso:espresso-core:${Version.espresso_core}")


}
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.2.0-alpha12" apply false
id("com.android.library") version "8.2.0-alpha12" apply false
id("org.jetbrains.kotlin.android") version "1.8.21" apply false
id("org.jetbrains.kotlin.jvm") version "1.8.21" apply false
alias(build.plugins.android.application) apply false
alias(build.plugins.android.library) apply false
alias(build.plugins.kotlin.android) apply false
alias(build.plugins.kotlin.jvm) apply false
}

tasks.create<Delete>("clean") {
Expand Down
10 changes: 6 additions & 4 deletions easy-crasher/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
import com.heyanle.buildsrc.Android

plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
alias(build.plugins.android.library)
alias(build.plugins.kotlin.android)
// id("com.android.library")
// id("org.jetbrains.kotlin.android")
}

android {
Expand Down Expand Up @@ -36,6 +38,6 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:${com.heyanle.buildsrc.Version.androidx_core_ktx}")
implementation("androidx.appcompat:appcompat:${com.heyanle.buildsrc.Version.androidx_appcompat}")
implementation(androidx.core.ktx)
implementation(androidx.appcompat)
}
6 changes: 3 additions & 3 deletions easy-dlna/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import com.heyanle.buildsrc.implementation

plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
alias(build.plugins.android.library)
alias(build.plugins.kotlin.android)
}

android {
Expand Down Expand Up @@ -36,7 +36,7 @@ android {
}

dependencies {
implementation("org.fourthline.cling:cling-core:${com.heyanle.buildsrc.Version.cling}")
implementation(libs.bundles.cling)
implementation("org.fourthline.cling:cling-support:${com.heyanle.buildsrc.Version.cling}")
//jetty()
//servlet()
Expand Down
6 changes: 4 additions & 2 deletions easy-i18n/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
// id("com.android.library")
// id("org.jetbrains.kotlin.android")
alias(build.plugins.android.library)
alias(build.plugins.kotlin.android)
}

android {
Expand Down
21 changes: 13 additions & 8 deletions extension/extension-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ import com.heyanle.buildsrc.Version
import org.jetbrains.kotlin.konan.properties.Properties

plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
// id("com.android.library")
// id("org.jetbrains.kotlin.android")
id("maven-publish")
id("signing")
alias(build.plugins.android.library)
alias(build.plugins.kotlin.android)
// alias(build.plugins.maven.publish)
// alias(build.plugins.signing)

}

android {
Expand Down Expand Up @@ -138,11 +143,11 @@ afterEvaluate {


dependencies {
api(SourceExtension.sourceApi)
api(SourceExtension.sourceUtils)
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Version.kotlinx_coroutines}")
api("com.squareup.okhttp3:okhttp:${Version.okhttp3}")
api("com.google.code.gson:gson:${Version.gson}")
api( "org.jsoup:jsoup:${Version.jsoup}")
api(extension.source.api)
api(extension.source.utils)
api(libs.kotlin.coroutines.android)
api(libs.okhttp3)
api(libs.gson)
api(libs.jsoup)

}
12 changes: 6 additions & 6 deletions extension/extension-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import com.heyanle.buildsrc.SourceExtension
import com.heyanle.buildsrc.Version

plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
alias(build.plugins.android.library)
alias(build.plugins.kotlin.android)
}

android {
Expand Down Expand Up @@ -34,8 +34,8 @@ android {
}

dependencies {
implementation("androidx.appcompat:appcompat:${Version.androidx_appcompat}")
implementation(SourceExtension.extensionApi)
implementation(SourceExtension.sourceApi)
implementation(SourceExtension.sourceUtils)
implementation(androidx.appcompat)
implementation(extension.source.utils)
implementation(extension.source.api)
implementation(extension.extension.api)
}
1 change: 0 additions & 1 deletion extension/extension-inner/.gitignore

This file was deleted.

46 changes: 0 additions & 46 deletions extension/extension-inner/build.gradle.kts

This file was deleted.

Empty file.
21 changes: 0 additions & 21 deletions extension/extension-inner/proguard-rules.pro

This file was deleted.

Loading

0 comments on commit 9ac4619

Please sign in to comment.