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.

Sign up for GitHub

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

Jump to bottom

Update dependencies #137

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Update dependencies #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f3f7a6
Update presentation and data layer dependencies
alireza-rafeezadeh May 24, 2021
bfd5ff7
Update android gradle plugin and jacoco
alireza-rafeezadeh May 25, 2021
4f7ffbe
Update testing layer dependencies
alireza-rafeezadeh May 25, 2021
d9b100a
Update android build tools sdk
alireza-rafeezadeh Jun 15, 2021
db43a72
Update travis.yml
alireza-rafeezadeh Jun 15, 2021
6c1b0e1
Update travis.yml
alireza-rafeezadeh Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android:
components:
- tools
- platform-tools
- build-tools-29.0.2
- android-29
- build-tools-30.0.2
- android-30
- extra
- "$ANDROID_TARGET"
- sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
Expand All @@ -22,6 +22,7 @@ android:
# -in secrets.tar.enc -out secrets.tar -d
# - tar xvf secrets.tar
script:
- yes | sdkmanager "platforms;android-30"
- "./gradlew build jacocoTestReport assembleAndroidTest"
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-audio -no-window &
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
id("kotlin-android")
id("kotlin-android-extensions")
id("kotlin-kapt")
id("jacoco-android")
id ("com.hiya.jacoco-android")
id("com.mikepenz.aboutlibraries.plugin")
id("com.google.firebase.crashlytics")
}
Expand All @@ -39,8 +39,8 @@ jacocoAndroidUnitTestReport {

android {

compileSdkVersion compileSdk
buildToolsVersion buildTools
compileSdkVersion rootProject.ext.compileSdk
buildToolsVersion rootProject.ext.buildTools

// signingConfigs {
// release {
Expand All @@ -53,7 +53,7 @@ android {

defaultConfig {
applicationId "com.k0d4black.theforce"
minSdkVersion minSdk
minSdkVersion rootProject.ext.minSdk
targetSdkVersion targetSdk
versionCode versionCodeMajor * 10000 + versionCodeMinor * 100 + versionCodePatch
versionName versionName
Expand Down
11 changes: 7 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ buildscript {
repositories {
google()
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:4.2.1'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due to this gradle build tool plugin the android build tools sdk will also have to be updated to 30.0.2 for the build to pass ,modify its references in travis and the build.gradle.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@odaridavid Alright I will fix it 👍

classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
classpath 'com.google.gms:google-services:4.3.8'
classpath "com.hiya:jacoco-android:0.2"
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.1'
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.1.2"
}
}
Expand Down
7 changes: 4 additions & 3 deletions data-local/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ plugins {
}

android {
compileSdkVersion compileSdk
buildToolsVersion buildTools
compileSdkVersion rootProject.ext.compileSdk
buildToolsVersion rootProject.ext.buildTools

defaultConfig {
minSdkVersion minSdk
minSdkVersion rootProject.ext.minSdk
targetSdkVersion targetSdk

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -62,4 +62,5 @@ dependencies {
testImplementation testDependencies.androidxJunit
testImplementation testDependencies.coroutinesTest
testImplementation testDependencies.robolectric
testImplementation appDependencies.lifecycleExtensions
}
62 changes: 31 additions & 31 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ext {

// Kotlin
kotlinVersion = '1.3.72'
kotlinVersion = '1.5.10'

// Android Core
compileSdk = 29
targetSdk = 29
compileSdk = 30
targetSdk = 30
minSdk = 21
buildTools = "29.0.2"
buildTools = "30.0.2"

// App Versioning
versionCodeMajor = 2
Expand All @@ -16,44 +16,44 @@ ext {
versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch"

// Dependencies Version - Presentation
appcompatVersion = '1.1.0'
androidxCoreKtxVersion = '1.1.0'
constraintLayoutVersion = '1.1.3'
appcompatVersion = '1.3.0'
androidxCoreKtxVersion = '1.5.0'
constraintLayoutVersion = '2.0.4'
supportV4Version = '1.0.0'
navVersion = '2.1.0'
materialVersion = '1.1.0-beta02'
analyticsVersion = '17.4.3'
fragmentKtxVersion = '1.1.0'
leakCanaryVersion = '2.0'
koinVersion = '2.1.5'
crashlyticsVersion = '17.0.1'
lifecycleExtensionsVersion = '2.1.0'
recyclerviewAnimationVersion = '3.0.0'
aboutLibsVersion = '8.0.0-rc01'
stethoVersion = '1.5.1'
materialVersion = '1.3.0'
analyticsVersion = '18.0.3'
fragmentKtxVersion = '1.3.4'
leakCanaryVersion = '2.7'
koinVersion = '2.2.2'
crashlyticsVersion = '18.0.0'
lifecycleExtensionsVersion = '2.2.0'
recyclerviewAnimationVersion = '4.0.2'
aboutLibsVersion = '8.8.6'
stethoVersion = '1.6.0'
kielVersion = '1.2.1'

// Data
retrofitVersion = '2.7.0'
moshiConverterVersion = '2.7.0'
loggingInterceptorVersion = '4.2.1'
roomVersion = '2.2.5'
retrofitVersion = '2.9.0'
moshiConverterVersion = '2.9.0'
loggingInterceptorVersion = '4.9.1'
roomVersion = '2.3.0'

// Domain
coroutinesCoreVersion = '1.3.3'
coroutinesCoreVersion = '1.5.0'

// Testing
mockitoVersion = '3.2.4'
junitVersion = '4.12'
espressoVersion = '3.2.0'
junitVersion = '4.13.2'
espressoVersion = '3.3.0'
androidxJunitVersion = '1.1.1'
truthVersion = '1.0'
truthVersion = '1.1.2'
mockitoInlineVersion = '2.13.0'
mockWebServerVersion = '4.2.1'
robolectricVersion = '4.3'
androidxTestCoreVersion = '1.0.0'
runnerVersion = '1.2.0'
rulesVersion = '1.2.0'
mockWebServerVersion = '4.9.1'
robolectricVersion = '4.5.1'
androidxTestCoreVersion = '1.3.0'
runnerVersion = '1.3.0'
rulesVersion = '1.3.0'
archComponentTestVersion = '2.1.0'


Expand All @@ -73,7 +73,7 @@ ext {
aboutLibraryCore : "com.mikepenz:aboutlibraries-core:$aboutLibsVersion",
aboutLibraryUi : "com.mikepenz:aboutlibraries:$aboutLibsVersion",
koinAndroid : "org.koin:koin-android:$koinVersion",
koinLifeCycleScope : "org.koin:koin-android-scope:$koinVersion",
koinLifeCycleScope : "org.koin:koin-androidx-scope:$koinVersion",
koinAndroidViewModel : "org.koin:koin-androidx-viewmodel:$koinVersion",
stetho : "com.facebook.stetho:stetho:$stethoVersion",
kiel : "me.ibrahimyilmaz:kiel:$kielVersion"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip