Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
evilthreads669966 committed May 28, 2021
1 parent d4755a0 commit cfe8cc0
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

2 changes: 1 addition & 1 deletion .idea/gradle.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

1 change: 1 addition & 0 deletions .idea/runConfigurations.xml

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

21 changes: 8 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'kotlin-parcelize'
apply plugin: 'dagger.hilt.android.plugin'
android {
compileSdkVersion 30
buildToolsVersion "30.0.2"
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.candroid.lacedboots"
minSdkVersion 24
Expand Down Expand Up @@ -55,25 +55,20 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
implementation "androidx.core:core-ktx:1.3.2"
implementation "androidx.fragment:fragment-ktx:1.2.5"
implementation "androidx.datastore:datastore-preferences:1.0.0-alpha01"
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation "androidx.core:core-ktx:$core_ktx_version"
testImplementation 'org.testng:testng:6.9.6'
testImplementation 'org.junit.jupiter:junit-jupiter'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation "com.google.dagger:hilt-android:2.29.1-alpha"
kapt "com.google.dagger:hilt-android-compiler:2.29.1-alpha"
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
androidTestImplementation "com.google.dagger:hilt-android-testing:2.29.1-alpha"
kaptAndroidTest "androidx.hilt:hilt-compiler:2.29.1-alpha"
androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
kaptAndroidTest "androidx.hilt:hilt-compiler:$hilt_version"
testImplementation "org.robolectric:robolectric:4.4"
testImplementation 'junit:junit:4.13.1'
kaptAndroidTest "com.google.dagger:hilt-android-compiler:2.29.1-alpha"
kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version"
testImplementation 'org.hamcrest:hamcrest:2.2'
api project(':bootlaces')
}
Expand Down
4 changes: 1 addition & 3 deletions bootlaces/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'kotlin-parcelize'

android {
compileSdkVersion 30
buildToolsVersion = '30.0.2'
buildToolsVersion = '30.0.3'

defaultConfig {
minSdkVersion 24
Expand Down Expand Up @@ -35,8 +35,6 @@ dependencies {
//JETPACK KTX
implementation "androidx.core:core-ktx:$core_ktx_version"

def room_version = "2.2.6"

implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
buildscript {
ext.kotlin_version = '1.4.21'
ext.core_ktx_version = '1.3.2'
ext.lifecycle_version = '2.2.0'
ext.coroutines_version = '1.4.2'
ext.hilt_version = '2.31.2-alpha'
ext.room_version = "2.2.6"
ext.kotlin_version = '1.5.0'
ext.core_ktx_version = '1.5.0'
ext.lifecycle_version = '2.3.1'
ext.coroutines_version = '1.5.0'
ext.hilt_version = '2.36'
ext.room_version = "2.3.0"
repositories {
google()
jcenter()
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ org.gradle.jvmargs=-Xmx1536m
kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true
def lifecycle_version = "2.2.0"
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 14 06:32:31 CDT 2020
#Thu May 27 22:39:55 CDT 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME

0 comments on commit cfe8cc0

Please sign in to comment.