Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@ jobs:
runs-on: ubuntu-24.04

steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'zulu'

- uses: actions/checkout@v2

- name: Lint and check
run: ./gradlew check ktlintCheck ktlintTestSourceSetCheck ktlintAndroidTestSourceSetCheck lintDebug testDebugUnitTest --stacktrace

- name: Publish reports
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: reports
path: sample-learning-app/build/reports
Expand Down
6 changes: 1 addition & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:${Versions.gradle}")
classpath(libs.android.gradlePlugin)
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
}
Expand All @@ -26,10 +26,6 @@ allprojects {
}
}

tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}

tasks.register("installGitHooks", Exec::class) {
commandLine("git", "config", "--local", "core.hooksPath", "git-hooks")
}
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ object Apps {
const val compileSdk = 31
const val minSdk = 21
const val targetSdk = 31
const val buildToolsVersion = "30.0.3"
}

object Versions {
const val gradle = "7.3.1"
const val kotlin = "1.7.0"
const val compose = "1.1.1"
const val ktlintGradle = "10.3.0"
Expand Down
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[versions]
agp = "8.9.1"

[libraries]
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 5 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#Tue Apr 08 13:43:56 CEST 2025
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading