Skip to content

Commit

Permalink
Update kotlin version to 1.8 & update hilt plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
w2sv committed Dec 31, 2022
1 parent d9b02a3 commit 9fe7a24
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

6 changes: 4 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ plugins {
}

android {
def PACKAGE_NAME = "com.w2sv.autocrop"

compileSdkVersion rootProject.ext.compileSdkVersion
namespace rootProject.ext.packageName
namespace PACKAGE_NAME

defaultConfig {
applicationId rootProject.ext.packageName
applicationId PACKAGE_NAME

minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.compileSdkVersion
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
buildscript {
ext.compileSdkVersion = 33
ext.minSdkVersion = 26
ext.packageName = 'com.w2sv.autocrop'
}

plugins {
id 'com.android.application' version '8.0.0-alpha09' apply false
id 'org.jetbrains.kotlin.android' version libs.versions.kotlin apply false
id 'com.google.dagger.hilt.android' version '2.42' apply false
id 'com.google.dagger.hilt.android' version libs.versions.hilt apply false
id 'de.mannodermaus.android-junit5' version '1.8.2.1' apply false
// id 'com.autonomousapps.dependency-analysis' version '1.16.0'
}
22 changes: 14 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
[versions]
kotlin = "1.7.20"
kotlin = '1.8.0'
hilt = '2.44.2'

[libraries]
jetbrains-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
jetbrains-kotlin = { module = 'org.jetbrains.kotlin:kotlin-stdlib-jdk7', version.ref = 'kotlin' }

# owned
kotlinutils = 'com.github.w2sv:KotlinUtils:0.0.5'
viewboundcontroller = 'com.github.w2sv:ViewboundController:0.0.7-rc1'
androidutils = 'com.github.w2sv:AndroidUtils:0.0.7'
typedpreferences = 'com.github.w2sv:TypedPreferences:1.0.0'
viewanimations = 'com.github.w2sv:AndroidViewAnimations:3.0.0'

# androidx
androidx-appcompat = 'androidx.appcompat:appcompat:1.5.1'
androidx-core = 'androidx.core:core-ktx:1.9.0'
androidx-viewpager2 = 'androidx.viewpager2:viewpager2:1.0.0'
Expand All @@ -16,28 +21,29 @@ androidx-fragment = 'androidx.fragment:fragment-ktx:1.6.0-alpha04'
androidx-activity = 'androidx.activity:activity-ktx:1.7.0-alpha02'
androidx-splashscreen = 'androidx.core:core-splashscreen:1.0.0'

# google
google-guava = 'com.google.guava:guava:31.1-jre'
google-material = 'com.google.android.material:material:1.7.0'
google-hilt = 'com.google.dagger:hilt-android:2.44.2'
google-hilt-kapt = 'com.google.dagger:hilt-android-compiler:2.44.2'
google-hilt = {module = 'com.google.dagger:hilt-android', version.ref = 'hilt'}
google-hilt-kapt = {module = 'com.google.dagger:hilt-android-compiler', version.ref = 'hilt'}

# other
slimber = 'com.github.PaulWoitaschek:Slimber:2.0.0'
snacky = 'com.github.matecode:Snacky:1.1.5'
animatoo = 'com.github.mohammadatif:Animatoo:master'
viewanimations = 'com.github.w2sv:AndroidViewAnimations:3.0.0'

# unitTest
## unitTest
junit5 = 'org.junit.jupiter:junit-jupiter:5.9.1'
androidx-junit = 'androidx.test.ext:junit:1.1.4'

# androidTest
## androidTest
androidx-testrunner = 'androidx.test:runner:1.5.1'
junit5-api = 'org.junit.jupiter:junit-jupiter-api:5.9.1'
junit5-mannodermaus-core = 'de.mannodermaus.junit5:android-test-core:1.3.0'
junit5-mannodermaus-runner = 'de.mannodermaus.junit5:android-test-runner:1.3.0'
junit5-params = 'org.junit.jupiter:junit-jupiter-params:5.9.1'

# .Espresso
# espresso
androidx-espresso-core = 'androidx.test.espresso:espresso-core:3.5.0'
androidx-espresso-intents = 'androidx.test.espresso:espresso-intents:3.5.0'

Expand Down
4 changes: 2 additions & 2 deletions module.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'

android {
compileSdk rootProject.ext.compileSdkVersion // really 24
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
minSdkVersion rootProject.ext.minSdkVersion // really 24
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
Expand Down
4 changes: 3 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ dependencyResolutionManagement {
}

rootProject.name = 'AutoCrop'
include ':app', ':bidirectionalviewpager', ':permissionhandler'
include ':app'
include ':bidirectionalviewpager'
include ':permissionhandler'

0 comments on commit 9fe7a24

Please sign in to comment.