Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gradle, Kotlin, library version #37

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
36 changes: 18 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.4.21'
ext.hilt_version ='2.31.2-alpha'
ext.kotlin_version = '1.6.21'
ext.hilt_version = '2.40.1'
repositories {
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:4.1.2"
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.gms:google-services:4.3.10'
}
}

Expand All @@ -30,27 +30,27 @@ task clean(type: Delete) {
ext {
// Sdk and tools
// Support library and architecture components support minSdk 14 and above.
minSdkVersion = 21
targetSdkVersion = 30
compileSdkVersion = 30
minSdkVersion = 22
targetSdkVersion = 32
compileSdkVersion = 32
buildToolsVersion = "30.0.2"
junitVersion = '5.7.0'
androidXJunitVersion = '1.1.3-alpha03'
androidXJunitVersion = '1.1.4-alpha07'
assertjVersion = '3.19.0'
coreTestingVersion = '2.1.0'
espressoIntentsVersion = '3.3.0'
espressoVersion = '3.3.0'
espressoIntentsVersion = '3.4.0'
espressoVersion = '3.4.0'
coroutinesTestVersion = '1.4.2-native-mt'
appcompatVersion='1.2.0'
materialVersion= '1.3.0-rc01'
activityKtxVersion= '1.2.0-rc01'
appcompatVersion='1.4.2'
materialVersion= '1.7.0-alpha02'
activityKtxVersion= '1.5.1'
retrofitVersion = '2.9.0'
moshiVersion = '1.11.0'
okhttpInterceptorVersion = '4.9.0'
moshiVersion = '1.13.0'
okhttpInterceptorVersion = '4.9.1'
mockVersion = '1.10.5'
annotationVersion ='1.1.0'
glid = '4.11.0'
annotationVersion ='1.4.0'
glid = '4.12.0'
hilt_viewmodels = '1.0.0-alpha03'
picassoVersion = '2.71828'
livedata_ktx='2.3.0'
livedata_ktx='2.5.1'
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
8 changes: 3 additions & 5 deletions local.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file should *NOT* be checked into Version Control Systems,
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=/Users/amohamed/Library/Android/sdk
#Sun Jul 31 00:41:53 EET 2022
sdk.dir=/Users/amlsakr/Library/Android/sdk