github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Use androidx-bom to resolve androidx versions

Browse Source
This commit is contained in:
Mikołaj Pich
2021-01-02 13:30:11 +01:00
parent f666683193
commit 55a79a61cf
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/build.gradle
View File

@ -5,6 +5,7 @@ apply plugin: 'dagger.hilt.android.plugin'
apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'com.github.triplet.play' apply plugin: 'com.github.triplet.play'
apply plugin: 'com.mikepenz.aboutlibraries.plugin' apply plugin: 'com.mikepenz.aboutlibraries.plugin'
apply plugin: "io.spring.dependency-management"
apply from: 'jacoco.gradle' apply from: 'jacoco.gradle'
apply from: 'sonarqube.gradle' apply from: 'sonarqube.gradle'
apply from: 'hooks.gradle' apply from: 'hooks.gradle'
@ -130,17 +131,24 @@ play {
} }
ext { ext {
work_manager = "2.4.0" androidxBoM = "2020.12.17"
room = "2.2.5" firebaseBoM = "26.2.0"
chucker = "3.4.0" chucker = "3.4.0"
mockk = "1.10.3-jdk8" mockk = "1.10.3-jdk8"
moshi = "1.11.0" moshi = "1.11.0"
constraintLayout = "1.1.3"
} }
configurations.all { configurations.all {
resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3" resolutionStrategy.force "androidx.constraintlayout:constraintlayout:$constraintLayout"
}
dependencyManagement {
imports {
mavenBom("net.serverpeon.androidx:androidx-bom:$androidxBoM") {
bomProperty("androidx.constraintlayout.version", constraintLayout)
}
}
} }
dependencies { dependencies {
implementation "io.github.wulkanowy:sdk:6edc8531" implementation "io.github.wulkanowy:sdk:6edc8531"
@ -149,42 +157,44 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
implementation "androidx.core:core-ktx:1.3.2" implementation(platform("net.serverpeon.androidx:androidx-bom:$androidxBoM"))
implementation "androidx.activity:activity-ktx:1.1.0" kapt(platform("net.serverpeon.androidx:androidx-bom:$androidxBoM"))
implementation "androidx.appcompat:appcompat:1.2.0" implementation 'androidx.core:core-ktx'
implementation "androidx.appcompat:appcompat-resources:1.2.0" implementation 'androidx.activity:activity-ktx'
implementation "androidx.fragment:fragment-ktx:1.2.5" implementation 'androidx.appcompat:appcompat'
implementation "androidx.annotation:annotation:1.1.0" implementation 'androidx.appcompat:appcompat-resources'
implementation "androidx.multidex:multidex:2.0.1" implementation 'androidx.fragment:fragment-ktx'
implementation 'androidx.annotation:annotation'
implementation 'androidx.multidex:multidex'
implementation "androidx.preference:preference-ktx:1.1.1" implementation 'androidx.preference:preference-ktx'
implementation "androidx.recyclerview:recyclerview:1.1.0" implementation 'androidx.recyclerview:recyclerview'
implementation "androidx.viewpager:viewpager:1.0.0" implementation 'androidx.viewpager:viewpager'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.swiperefreshlayout:swiperefreshlayout'
implementation "androidx.constraintlayout:constraintlayout:2.0.1" implementation 'androidx.constraintlayout:constraintlayout'
implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0" implementation 'androidx.coordinatorlayout:coordinatorlayout'
implementation "com.google.android.material:material:1.2.1" implementation "com.google.android.material:material:1.2.1"
implementation "com.github.wulkanowy:material-chips-input:2.1.1" implementation "com.github.wulkanowy:material-chips-input:2.1.1"
implementation "com.github.PhilJay:MPAndroidChart:v3.1.0" implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
implementation "me.zhanghai.android.materialprogressbar:library:1.6.1" implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
implementation "androidx.work:work-runtime-ktx:$work_manager" implementation 'androidx.work:work-runtime-ktx'
implementation "androidx.work:work-gcm:$work_manager" implementation 'androidx.work:work-gcm'
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0" implementation 'androidx.lifecycle:lifecycle-livedata-ktx'
implementation "androidx.room:room-runtime:$room" implementation 'androidx.room:room-runtime'
implementation "androidx.room:room-ktx:$room" implementation 'androidx.room:room-ktx'
kapt "androidx.room:room-compiler:$room" kapt "androidx.room:room-compiler"
implementation "com.google.dagger:hilt-android:$hilt_version" implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
implementation 'androidx.hilt:hilt-work:1.0.0-alpha02' implementation 'androidx.hilt:hilt-work'
kapt 'androidx.hilt:hilt-compiler:1.0.0-alpha02' kapt 'androidx.hilt:hilt-compiler'
implementation "com.aurelhubert:ahbottomnavigation:2.3.4" implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
implementation "com.ncapdevi:frag-nav:3.3.0" implementation "com.ncapdevi:frag-nav:3.3.0"
implementation "com.github.YarikSOffice:lingver:1.2.2" implementation "com.github.YarikSOffice:lingver:1.3.0"
implementation "com.squareup.moshi:moshi:$moshi" implementation "com.squareup.moshi:moshi:$moshi"
implementation "com.squareup.moshi:moshi-adapters:$moshi" implementation "com.squareup.moshi:moshi-adapters:$moshi"
@ -198,7 +208,7 @@ dependencies {
implementation "io.github.wulkanowy:AppKillerManager:3.0.0" implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
implementation 'me.xdrop:fuzzywuzzy:1.3.1' implementation 'me.xdrop:fuzzywuzzy:1.3.1'
playImplementation platform('com.google.firebase:firebase-bom:26.2.0') playImplementation platform("com.google.firebase:firebase-bom:$firebaseBoM")
playImplementation 'com.google.firebase:firebase-analytics-ktx' playImplementation 'com.google.firebase:firebase-analytics-ktx'
playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx' playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx'
playImplementation "com.google.firebase:firebase-inappmessaging-ktx" playImplementation "com.google.firebase:firebase-inappmessaging-ktx"
@ -219,11 +229,11 @@ dependencies {
testImplementation "io.mockk:mockk:$mockk" testImplementation "io.mockk:mockk:$mockk"
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2' testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
androidTestImplementation "androidx.test:core:1.3.0" androidTestImplementation 'androidx.test:core'
androidTestImplementation "androidx.test:runner:1.3.0" androidTestImplementation 'androidx.test:runner'
androidTestImplementation "androidx.test.ext:junit:1.1.2" androidTestImplementation "androidx.test.ext:junit:1.1.2"
androidTestImplementation "io.mockk:mockk-android:$mockk" androidTestImplementation "io.mockk:mockk-android:$mockk"
androidTestImplementation "androidx.room:room-testing:$room" androidTestImplementation 'androidx.room:room-testing'
androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
} }

1
build.gradle
View File

@ -22,6 +22,7 @@ buildscript {
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0" classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
classpath "io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE"
} }
} }