Skip to content

Commit

Permalink
Update dependencies (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
mars885 authored Aug 4, 2024
1 parent c2cb07f commit cb0bd42
Show file tree
Hide file tree
Showing 45 changed files with 425 additions and 315 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,13 @@ max_line_length = 120

[*.yml]
indent_size = 2

[*.{kt,kts}]
ktlint_standard_annotation = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
ktlint_standard_blank-line-before-declaration = disabled
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_string-template-indent = disabled
ktlint_standard_spacing-between-declarations-with-annotations = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_class-signature = disabled
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Generate a Cache Key
run: ./checksum.sh checksum.txt
Expand Down Expand Up @@ -51,11 +51,11 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Generate a Cache Key
run: ./checksum.sh checksum.txt
Expand Down Expand Up @@ -86,11 +86,11 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Generate a Cache Key
run: ./checksum.sh checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'

- name: Generate a Cache Key
run: ./checksum.sh checksum.txt
Expand Down
15 changes: 13 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/

import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
import io.gitlab.arturbosch.detekt.Detekt

plugins {
Expand All @@ -40,13 +41,21 @@ buildscript {
detekt {
parallel = true
buildUponDefaultConfig = true
config = files("config/detekt/detekt.yml")
config.setFrom("config/detekt/detekt.yml")
}

tasks.withType<Detekt>().configureEach {
reports.html.required.set(true)
}

tasks.withType<DependencyUpdatesTask> {
rejectVersionIf {
listOf("alpha", "beta", "rc").any { keyword ->
candidate.version.lowercase().contains(keyword)
}
}
}

allprojects {
apply(plugin = PLUGIN_DETEKT)
apply(plugin = PLUGIN_KTLINT)
Expand All @@ -57,14 +66,16 @@ allprojects {
}

configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
version.set(versions.ktlint)
android.set(true)
outputToConsole.set(true)
verbose.set(true)
reporters {
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.HTML)
}
}
}

val clean by tasks.registering(Delete::class) {
delete(buildDir)
delete(layout.buildDirectory)
}
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

plugins {
`kotlin-dsl`
`kotlin-dsl-base`
}

repositories {
Expand All @@ -24,6 +24,6 @@ repositories {
}

dependencies {
implementation("com.android.tools.build:gradle:7.2.2")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
implementation("com.android.tools.build:gradle:8.3.1")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
}
37 changes: 19 additions & 18 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import org.gradle.api.JavaVersion

object appConfig {

const val compileSdkVersion = 32
const val targetSdkVersion = 32
const val compileSdkVersion = 34
const val targetSdkVersion = 34
const val minSdkVersion = 21
const val applicationId = "com.paulrybitskyi.valuepicker.sample"

val javaCompatibilityVersion = JavaVersion.VERSION_1_8
val kotlinCompatibilityVersion = JavaVersion.VERSION_1_8
val javaCompatibilityVersion = JavaVersion.VERSION_17
val kotlinCompatibilityVersion = JavaVersion.VERSION_17
}

object publishingConfig {
Expand Down Expand Up @@ -54,31 +54,32 @@ object publishingConfig {

object versions {

const val kotlin = "1.7.0" // also in buildSrc build.gradle.kts file
const val gradlePlugin = "7.2.2" // also in buildSrc build.gradle.kts file and lint version
const val detektPlugin = "1.20.0"
const val ktlintPlugin = "10.3.0"
const val gradleVersionsPlugin = "0.42.0"
const val dokkaPlugin = "1.7.0"
const val appCompat = "1.4.2"
const val recyclerView = "1.2.1"
const val navigation = "2.5.1"
const val kotlin = "2.0.0" // also in buildSrc build.gradle.kts file
const val androidPlugin = "8.3.1" // also in buildSrc build.gradle.kts file and lint version
const val detektPlugin = "1.23.6"
const val ktlintPlugin = "12.1.1"
const val gradleVersionsPlugin = "0.51.0"
const val dokkaPlugin = "1.9.20"
const val appCompat = "1.7.0"
const val recyclerView = "1.3.2"
const val navigation = "2.7.7"
const val constraintLayout = "2.1.4"
const val coreKtx = "1.8.0"
const val coreKtx = "1.13.1"
const val commonsCore = "1.0.3"
const val commonsKtx = "1.0.3"
const val commonsRecyclerView = "1.0.1"
const val autoService = "1.0"
const val lint = "30.2.2" // lintVersion = gradlePluginVersion + 23.0.0
const val ktlint = "1.3.1"
const val autoService = "1.1.1"
const val lint = "31.3.1" // lintVersion = androidPlugin + 23.0.0
const val jUnit = "4.13.2"
const val jUnitExt = "1.1.3"
const val jUnitExt = "1.2.1"
}

object deps {

object plugins {

const val androidGradle = "com.android.tools.build:gradle:${versions.gradlePlugin}"
const val androidGradle = "com.android.tools.build:gradle:${versions.androidPlugin}"
const val kotlinGradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
const val gradleVersions = "com.github.ben-manes:gradle-versions-plugin:${versions.gradleVersionsPlugin}"
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokkaPlugin}"
Expand Down
Loading

0 comments on commit cb0bd42

Please sign in to comment.