Skip to content

Commit

Permalink
Build tools & maintenance update
Browse files Browse the repository at this point in the history
  • Loading branch information
cioccarellia committed Jan 15, 2024
1 parent b22fb5e commit 9a8b808
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 45 deletions.
17 changes: 5 additions & 12 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<a href="https://github.com/kevlar-kt/kevlar/releases"><img src="https://img.shields.io/github/v/tag/kevlar-kt/kevlar" alt="Latest tag" /></a>
<a href="https://github.com/kevlar-kt/kevlar/actions?query=workflow%3A%22Build%22"><img src="https://github.com/kevlar-kt/kevlar/actions/workflows/push-debug-build.yaml/badge.svg" alt="Android CI" /></a>
<a href="https://source.android.com/setup/start/build-numbers"><img src="https://img.shields.io/badge/minSdk-19-00E676.svg" alt="Android Min Sdk"></a>
<a href="https://kotlinlang.org/docs/releases.html"><img src="https://img.shields.io/badge/kotlin-1.9.10-orange.svg" alt="Kotlin"></a>
<a href="https://kotlinlang.org/docs/releases.html"><img src="https://img.shields.io/badge/kotlin-1.9.20-orange.svg" alt="Kotlin"></a>
<a href="https://androidweekly.net/issues/issue-528"><img src="https://img.shields.io/badge/AndroidWeekly-528-5bb3e2" alt="AndroidWeekly Issue"></a>
<a href="https://us12.campaign-archive.com/?u=f39692e245b94f7fb693b6d82&id=15eb56d1f5"><img src="https://img.shields.io/badge/KotlinWeekly-315-%238a78e8" alt="Kotlin"></a>
<a href="https://github.com/kevlar-kt/kevlar/blob/master/LICENSE.md"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg" alt="License"></a>
Expand Down
8 changes: 4 additions & 4 deletions antipiracy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ android {
* */
dependencies {
// Kotlin dependencies
compileOnly "androidx.annotation:annotation:1.6.0"
compileOnly "androidx.annotation:annotation:1.7.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

// Testing dependencies
testImplementation "junit:junit:4.13.2"
testImplementation "androidx.test:core:1.5.0"
testImplementation "org.mockito:mockito-core:5.5.0"
testImplementation "com.google.truth:truth:1.1.5"
testImplementation "org.robolectric:robolectric:4.10.3"
testImplementation "org.mockito:mockito-core:5.9.0"
testImplementation "com.google.truth:truth:1.2.0"
testImplementation "org.robolectric:robolectric:4.11.1"
}


Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'

buildscript {
ext {
kotlin_version = "1.9.10"
kotlin_version = "1.9.20"
}

repositories {
Expand All @@ -16,10 +16,10 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.1'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.github.ben-manes:gradle-versions-plugin:0.47.0"
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.48'
classpath "com.github.ben-manes:gradle-versions-plugin:0.50.0"
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.50'
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
}
}
Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
#org.gradle.configuration-cache=true

# cached builds
# org.gradle.configuration-cache=true
8 changes: 4 additions & 4 deletions integrity/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ android {
* */
dependencies {
// Kotlin dependencies
compileOnly "androidx.annotation:annotation:1.6.0"
compileOnly "androidx.annotation:annotation:1.7.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

// Testing dependencies
testImplementation "junit:junit:4.13.2"
testImplementation "androidx.test:core:1.5.0"
testImplementation "org.mockito:mockito-core:5.5.0"
testImplementation "com.google.truth:truth:1.1.5"
testImplementation "org.robolectric:robolectric:4.10.3"
testImplementation "org.mockito:mockito-core:5.9.0"
testImplementation "com.google.truth:truth:1.2.0"
testImplementation "org.robolectric:robolectric:4.11.1"
}


Expand Down
2 changes: 0 additions & 2 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ plugins:
lang: en
- redirects:
redirect_maps:
- minify:
minify_html: true


nav:
Expand Down
8 changes: 4 additions & 4 deletions rooting/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

// LibSU
// LibSU / Do Not Update, noinspection GradleDependency
implementation "com.github.topjohnwu.libsu:core:5.2.0"
// exclude group: 'androidx.annotation', module: 'annotation'

// Testing dependencies
testImplementation "junit:junit:4.13.2"
testImplementation "androidx.test:core:1.5.0"
testImplementation "org.mockito:mockito-core:5.5.0"
testImplementation "com.google.truth:truth:1.1.5"
testImplementation "org.robolectric:robolectric:4.10.3"
testImplementation "org.mockito:mockito-core:5.9.0"
testImplementation "com.google.truth:truth:1.2.0"
testImplementation "org.robolectric:robolectric:4.11.1"

}

Expand Down
26 changes: 13 additions & 13 deletions showcase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,29 @@ dependencies {
}


implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.core:core-ktx:1.12.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "com.google.android.material:material:1.11.0-alpha02"
implementation "com.google.android.material:material:1.11.0"

def multidex_version = "2.0.1"
implementation "androidx.multidex:multidex:$multidex_version"

implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.1"
implementation "androidx.navigation:navigation-ui-ktx:2.7.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.6"
implementation "androidx.navigation:navigation-ui-ktx:2.7.6"

implementation "com.jakewharton.timber:timber:5.0.1"
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'

implementation "com.google.dagger:hilt-android:2.48"
kapt "com.google.dagger:hilt-compiler:2.48"
implementation "com.google.dagger:hilt-android:2.50"
kapt "com.google.dagger:hilt-compiler:2.50"

testImplementation "junit:junit:4.13.2"
testImplementation "androidx.test:core:1.5.0"
testImplementation "org.mockito:mockito-core:5.5.0"
testImplementation "com.google.truth:truth:1.1.5"
testImplementation "org.robolectric:robolectric:4.10.3"
testImplementation "org.mockito:mockito-core:5.9.0"
testImplementation "com.google.truth:truth:1.2.0"
testImplementation "org.robolectric:robolectric:4.11.1"
}

0 comments on commit 9a8b808

Please sign in to comment.