Update version and dependencies to compiles against Dolphin.
This commit is contained in:
parent
3d3869585e
commit
978826e6a6
3 changed files with 43 additions and 36 deletions
|
|
@ -3,16 +3,17 @@ plugins {
|
|||
id 'kotlin-android'
|
||||
id 'kotlin-kapt'
|
||||
id 'dagger.hilt.android.plugin'
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdk 32
|
||||
compileSdk 33
|
||||
buildToolsVersion "33.0.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.pixelized.biblib"
|
||||
minSdk 23
|
||||
targetSdk 32
|
||||
minSdk 26
|
||||
targetSdk 33
|
||||
versionCode generateVersionCode()
|
||||
versionName "0.1.3"
|
||||
|
||||
|
|
@ -69,7 +70,7 @@ android {
|
|||
}
|
||||
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion '1.2.0-rc02'
|
||||
kotlinCompilerExtensionVersion '1.3.0'
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
|
|
@ -77,57 +78,63 @@ android {
|
|||
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
||||
}
|
||||
}
|
||||
|
||||
lint {
|
||||
disable 'MissingTranslation'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// Android core
|
||||
implementation 'androidx.core:core-ktx:1.8.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.4.2'
|
||||
implementation 'androidx.core:core-ktx:1.9.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.6.0-beta01'
|
||||
implementation 'com.google.android.material:material:1.6.1'
|
||||
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
|
||||
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
|
||||
implementation 'androidx.activity:activity-compose:1.4.0'
|
||||
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
|
||||
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
|
||||
implementation 'androidx.core:core-ktx:+'
|
||||
debugImplementation "androidx.activity:activity-ktx:1.6.0-rc01"
|
||||
implementation 'androidx.activity:activity-compose:1.5.1'
|
||||
|
||||
// Android Compose
|
||||
implementation "androidx.compose.ui:ui:1.2.0-rc02"
|
||||
implementation "androidx.compose.material:material:1.1.1"
|
||||
implementation "androidx.compose.ui:ui:1.2.1"
|
||||
implementation "androidx.compose.material:material:1.2.1"
|
||||
implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1"
|
||||
implementation "androidx.compose.runtime:runtime-livedata:1.1.1"
|
||||
implementation "androidx.compose.ui:ui-tooling-preview:1.1.1"
|
||||
debugImplementation "androidx.compose.ui:ui-tooling:1.1.1"
|
||||
implementation "androidx.compose.runtime:runtime-livedata:1.2.1"
|
||||
implementation "androidx.compose.ui:ui-tooling-preview:1.2.1"
|
||||
debugImplementation "androidx.compose.ui:ui-tooling:1.2.1"
|
||||
|
||||
// Paging
|
||||
implementation "androidx.paging:paging-compose:1.0.0-alpha15"
|
||||
implementation "androidx.paging:paging-compose:1.0.0-alpha16"
|
||||
|
||||
// Material design icons
|
||||
implementation "androidx.compose.material:material-icons-core:1.1.1"
|
||||
implementation "androidx.compose.material:material-icons-extended:1.1.1"
|
||||
implementation "androidx.compose.material:material-icons-core:1.2.1"
|
||||
implementation "androidx.compose.material:material-icons-extended:1.2.1"
|
||||
|
||||
// Injection
|
||||
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
|
||||
implementation "com.google.dagger:hilt-android:2.40.5"
|
||||
kapt "com.google.dagger:hilt-compiler:2.40.5"
|
||||
implementation "com.google.dagger:hilt-android:2.43.2"
|
||||
kapt "com.google.dagger:hilt-compiler:2.43.2"
|
||||
|
||||
// Accompanist
|
||||
implementation "com.google.accompanist:accompanist-systemuicontroller:0.24.7-alpha"
|
||||
implementation "com.google.accompanist:accompanist-insets:0.24.7-alpha"
|
||||
implementation "com.google.accompanist:accompanist-drawablepainter:0.24.7-alpha"
|
||||
implementation "com.google.accompanist:accompanist-navigation-material:0.24.7-alpha"
|
||||
implementation "com.google.accompanist:accompanist-pager:0.24.7-alpha"
|
||||
implementation "com.google.accompanist:accompanist-pager-indicators:0.24.7-alpha"
|
||||
implementation "com.google.accompanist:accompanist-navigation-material:0.26.5-rc"
|
||||
implementation "com.google.accompanist:accompanist-systemuicontroller:0.26.5-rc"
|
||||
implementation "com.google.accompanist:accompanist-pager-indicators:0.26.5-rc"
|
||||
implementation "com.google.accompanist:accompanist-drawablepainter:0.26.5-rc"
|
||||
implementation "com.google.accompanist:accompanist-insets:0.26.5-rc"
|
||||
implementation "com.google.accompanist:accompanist-pager:0.26.5-rc"
|
||||
|
||||
// Landscapist
|
||||
implementation "com.github.skydoves:landscapist-glide:1.5.2"
|
||||
kapt 'com.github.bumptech.glide:compiler:4.13.2' // this have to be align with landscapist-glide
|
||||
|
||||
// Navigation
|
||||
implementation "androidx.navigation:navigation-compose:2.4.2"
|
||||
implementation "androidx.navigation:navigation-compose:2.5.2"
|
||||
|
||||
// Splash Screen support prior to Android 12
|
||||
implementation "androidx.core:core-splashscreen:1.0.0-rc01"
|
||||
implementation "androidx.core:core-splashscreen:1.0.0"
|
||||
|
||||
// Google sign in.
|
||||
implementation "com.google.android.gms:play-services-auth:20.2.0"
|
||||
implementation "com.google.android.gms:play-services-auth:20.3.0"
|
||||
|
||||
// RetroFit & Gson for webservice call
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
|
||||
|
|
@ -138,9 +145,9 @@ dependencies {
|
|||
implementation "com.squareup.okhttp3:logging-interceptor:4.8.1"
|
||||
|
||||
// Room
|
||||
implementation "androidx.room:room-runtime:2.4.2"
|
||||
implementation "androidx.room:room-ktx:2.4.2"
|
||||
kapt "androidx.room:room-compiler:2.4.2"
|
||||
implementation "androidx.room:room-runtime:2.4.3"
|
||||
implementation "androidx.room:room-ktx:2.4.3"
|
||||
kapt "androidx.room:room-compiler:2.4.3"
|
||||
}
|
||||
|
||||
static def generateVersionCode() {
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ buildscript {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.2.1'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
|
||||
classpath "com.google.dagger:hilt-android-gradle-plugin:2.40.5"
|
||||
classpath 'com.android.tools.build:gradle:7.3.1'
|
||||
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
|
||||
classpath "com.google.dagger:hilt-android-gradle-plugin:2.43.2"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Wed Apr 28 21:29:33 CEST 2021
|
||||
#Sat Oct 15 11:40:37 CEST 2022
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue