Skip to content

Commit

Permalink
Dependencies/plugins update
Browse files Browse the repository at this point in the history
Signed-off-by: enricocid <[email protected]>
  • Loading branch information
enricocid committed Jul 13, 2023
1 parent dd6c6d6 commit 24230b5
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 24 deletions.
47 changes: 26 additions & 21 deletions project/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,27 @@ android {
// through dependencies).
compileOptions {
encoding "UTF-8"
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

// For Kotlin projects
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}

lintOptions {
disable 'MissingTranslation', 'AllowBackup',
'GoogleAppIndexingWarning'
packagingOptions {
jniLibs {
excludes += ['META-INF/*']
}
resources {
excludes += ['META-INF/*']
}
}

packagingOptions {
exclude 'META-INF/*'

namespace 'com.iven.musicplayergo'
lint {
disable 'MissingTranslation', 'AllowBackup', 'GoogleAppIndexingWarning'
}
}

Expand All @@ -77,30 +82,30 @@ dependencies {
//https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
//https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2'

// Support
//https://developer.android.com/jetpack/androidx/versions
implementation "androidx.activity:activity-ktx:1.6.1"
implementation 'androidx.browser:browser:1.4.0'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.window:window:1.0.0'
implementation "androidx.activity:activity-ktx:1.7.2"
implementation 'androidx.browser:browser:1.5.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.window:window:1.1.0'
implementation 'androidx.media:media:1.6.0'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
//https://github.com/material-components/material-components-android/releases
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.9.0'

// Third-party
//https://mvnrepository.com/artifact/com.squareup.moshi/moshi-kotlin
implementation 'com.squareup.moshi:moshi:1.14.0'
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.14.0'
implementation 'com.squareup.moshi:moshi:1.15.0'
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.15.0'

//https://github.com/zhanghai/AndroidFastScroll/releases
implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
implementation 'me.zhanghai.android.fastscroll:library:1.2.0'

//https://github.com/coil-kt/coil/releases
implementation 'io.coil-kt:coil:2.2.2'
implementation 'io.coil-kt:coil:2.4.0'
}
4 changes: 2 additions & 2 deletions project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.8.21'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion project/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 24230b5

Please sign in to comment.