Skip to content

Commit 9fe7a24

Browse files
committed
Update kotlin version to 1.8 & update hilt plugin
1 parent d9b02a3 commit 9fe7a24

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ plugins {
88
}
99

1010
android {
11+
def PACKAGE_NAME = "com.w2sv.autocrop"
12+
1113
compileSdkVersion rootProject.ext.compileSdkVersion
12-
namespace rootProject.ext.packageName
14+
namespace PACKAGE_NAME
1315

1416
defaultConfig {
15-
applicationId rootProject.ext.packageName
17+
applicationId PACKAGE_NAME
1618

1719
minSdkVersion rootProject.ext.minSdkVersion
1820
targetSdkVersion rootProject.ext.compileSdkVersion

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
buildscript {
22
ext.compileSdkVersion = 33
33
ext.minSdkVersion = 26
4-
ext.packageName = 'com.w2sv.autocrop'
54
}
65

76
plugins {
87
id 'com.android.application' version '8.0.0-alpha09' apply false
98
id 'org.jetbrains.kotlin.android' version libs.versions.kotlin apply false
10-
id 'com.google.dagger.hilt.android' version '2.42' apply false
9+
id 'com.google.dagger.hilt.android' version libs.versions.hilt apply false
1110
id 'de.mannodermaus.android-junit5' version '1.8.2.1' apply false
1211
// id 'com.autonomousapps.dependency-analysis' version '1.16.0'
1312
}

gradle/libs.versions.toml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
[versions]
2-
kotlin = "1.7.20"
2+
kotlin = '1.8.0'
3+
hilt = '2.44.2'
34

45
[libraries]
5-
jetbrains-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
6+
jetbrains-kotlin = { module = 'org.jetbrains.kotlin:kotlin-stdlib-jdk7', version.ref = 'kotlin' }
7+
8+
# owned
69
kotlinutils = 'com.github.w2sv:KotlinUtils:0.0.5'
710
viewboundcontroller = 'com.github.w2sv:ViewboundController:0.0.7-rc1'
811
androidutils = 'com.github.w2sv:AndroidUtils:0.0.7'
912
typedpreferences = 'com.github.w2sv:TypedPreferences:1.0.0'
13+
viewanimations = 'com.github.w2sv:AndroidViewAnimations:3.0.0'
1014

15+
# androidx
1116
androidx-appcompat = 'androidx.appcompat:appcompat:1.5.1'
1217
androidx-core = 'androidx.core:core-ktx:1.9.0'
1318
androidx-viewpager2 = 'androidx.viewpager2:viewpager2:1.0.0'
@@ -16,28 +21,29 @@ androidx-fragment = 'androidx.fragment:fragment-ktx:1.6.0-alpha04'
1621
androidx-activity = 'androidx.activity:activity-ktx:1.7.0-alpha02'
1722
androidx-splashscreen = 'androidx.core:core-splashscreen:1.0.0'
1823

24+
# google
1925
google-guava = 'com.google.guava:guava:31.1-jre'
2026
google-material = 'com.google.android.material:material:1.7.0'
21-
google-hilt = 'com.google.dagger:hilt-android:2.44.2'
22-
google-hilt-kapt = 'com.google.dagger:hilt-android-compiler:2.44.2'
27+
google-hilt = {module = 'com.google.dagger:hilt-android', version.ref = 'hilt'}
28+
google-hilt-kapt = {module = 'com.google.dagger:hilt-android-compiler', version.ref = 'hilt'}
2329

30+
# other
2431
slimber = 'com.github.PaulWoitaschek:Slimber:2.0.0'
2532
snacky = 'com.github.matecode:Snacky:1.1.5'
2633
animatoo = 'com.github.mohammadatif:Animatoo:master'
27-
viewanimations = 'com.github.w2sv:AndroidViewAnimations:3.0.0'
2834

29-
# unitTest
35+
## unitTest
3036
junit5 = 'org.junit.jupiter:junit-jupiter:5.9.1'
3137
androidx-junit = 'androidx.test.ext:junit:1.1.4'
3238

33-
# androidTest
39+
## androidTest
3440
androidx-testrunner = 'androidx.test:runner:1.5.1'
3541
junit5-api = 'org.junit.jupiter:junit-jupiter-api:5.9.1'
3642
junit5-mannodermaus-core = 'de.mannodermaus.junit5:android-test-core:1.3.0'
3743
junit5-mannodermaus-runner = 'de.mannodermaus.junit5:android-test-runner:1.3.0'
3844
junit5-params = 'org.junit.jupiter:junit-jupiter-params:5.9.1'
3945

40-
# .Espresso
46+
# espresso
4147
androidx-espresso-core = 'androidx.test.espresso:espresso-core:3.5.0'
4248
androidx-espresso-intents = 'androidx.test.espresso:espresso-intents:3.5.0'
4349

module.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apply plugin: 'com.android.library'
22
apply plugin: 'org.jetbrains.kotlin.android'
33

44
android {
5-
compileSdk rootProject.ext.compileSdkVersion // really 24
5+
compileSdk rootProject.ext.compileSdkVersion
66
defaultConfig {
7-
minSdkVersion rootProject.ext.minSdkVersion
7+
minSdkVersion rootProject.ext.minSdkVersion // really 24
88
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
99
}
1010
buildTypes {

settings.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ dependencyResolutionManagement {
1515
}
1616

1717
rootProject.name = 'AutoCrop'
18-
include ':app', ':bidirectionalviewpager', ':permissionhandler'
18+
include ':app'
19+
include ':bidirectionalviewpager'
20+
include ':permissionhandler'

0 commit comments

Comments
 (0)