mirror of
https://github.com/yuliskov/SmartTube.git
synced 2025-12-30 10:30:20 -06:00
kotlin support
This commit is contained in:
Submodule MediaServiceCore updated: 87c1826e18...147b037168
Submodule SharedModules updated: 157ddcf38d...aa4cfca0db
11
build.gradle
11
build.gradle
@@ -2,13 +2,16 @@ apply from: gradle.ext.sharedModulesConstants
|
||||
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
buildscript {
|
||||
apply from: gradle.ext.sharedModulesConstants
|
||||
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.1'
|
||||
classpath 'com.android.tools.build:gradle:3.5.4'
|
||||
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + kotlinVersion
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
@@ -25,8 +28,8 @@ allprojects {
|
||||
}
|
||||
configurations.all {
|
||||
// WorkManager conflict resolution
|
||||
resolutionStrategy.force "androidx.lifecycle:lifecycle-livedata-core:" + liveDataVersion
|
||||
resolutionStrategy.force "androidx.lifecycle:lifecycle-livedata:" + liveDataVersion
|
||||
resolutionStrategy.force "androidx.lifecycle:lifecycle-runtime:" + liveDataVersion
|
||||
resolutionStrategy.force 'androidx.lifecycle:lifecycle-livedata-core:' + liveDataVersion
|
||||
resolutionStrategy.force 'androidx.lifecycle:lifecycle-livedata:' + liveDataVersion
|
||||
resolutionStrategy.force 'androidx.lifecycle:lifecycle-runtime:' + liveDataVersion
|
||||
}
|
||||
}
|
||||
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
|
||||
#distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
|
||||
|
||||
Reference in New Issue
Block a user