Update compose version.

This commit is contained in:
Thomas Andres Gomez 2021-05-21 19:22:02 +02:00
parent daae225916
commit 295bb522e5
2 changed files with 27 additions and 28 deletions

View file

@ -50,72 +50,71 @@ android {
} }
} }
buildFeatures {
compose true
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = "1.8"
}
buildFeatures {
// Enables Jetpack Compose for this module
compose true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion '1.0.0-beta05' kotlinCompilerExtensionVersion '1.0.0-beta07'
} }
} }
dependencies { dependencies {
implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.3.0' implementation 'com.google.android.material:material:1.3.0'
// Android compose // Android compose
implementation 'androidx.compose.ui:ui:1.0.0-beta06' implementation "androidx.compose.ui:ui:1.0.0-beta07"
// Tooling support (Previews, etc.) // Tooling support (Previews, etc.)
implementation 'androidx.compose.ui:ui-tooling:1.0.0-beta06' implementation "androidx.compose.ui:ui-tooling:1.0.0-beta07"
// Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.) // Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
implementation 'androidx.compose.foundation:foundation:1.0.0-beta06' implementation "androidx.compose.foundation:foundation:1.0.0-beta07"
// Material Design // Material Design
implementation 'androidx.compose.material:material:1.0.0-beta06' implementation "androidx.compose.material:material:1.0.0-beta07"
// Material design icons // Material design icons
implementation 'androidx.compose.material:material-icons-core:1.0.0-beta06' implementation "androidx.compose.material:material-icons-core:1.0.0-beta07"
implementation 'androidx.compose.material:material-icons-extended:1.0.0-beta06' implementation "androidx.compose.material:material-icons-extended:1.0.0-beta07"
// Integration with activities // Integration with activities
implementation 'androidx.activity:activity-compose:1.3.0-alpha07' implementation "androidx.activity:activity-compose:1.3.0-beta07"
// Integration with ViewModels // Integration with ViewModels
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04' implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-beta07"
// Integration with observables // Integration with observables
implementation 'androidx.compose.runtime:runtime-livedata:1.0.0-beta06' implementation "androidx.compose.runtime:runtime-livedata:1.0.0-beta07"
implementation 'androidx.compose.runtime:runtime-rxjava2:1.0.0-beta06'
// ConstraintLayout // ConstraintLayout
implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha06" implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha07"
// Google sign in. // Google sign in.
implementation 'com.google.android.gms:play-services-auth:19.0.0' implementation "com.google.android.gms:play-services-auth:19.0.0"
// Paging
implementation "androidx.paging:paging-compose:1.0.0-alpha09"
// RetroFit & Gson for webservice call // RetroFit & Gson for webservice call
implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.code.gson:gson:2.8.6'
//Logging Network Calls
implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1' // Logging Network Calls
implementation "com.squareup.okhttp3:logging-interceptor:4.8.1"
// Room // Room
implementation "androidx.room:room-runtime:2.3.0" implementation "androidx.room:room-runtime:2.3.0"
implementation "androidx.room:room-ktx:2.3.0" implementation "androidx.room:room-ktx:2.3.0"
kapt "androidx.room:room-compiler:2.3.0" kapt "androidx.room:room-compiler:2.3.0"
// Paging
implementation "androidx.paging:paging-compose:1.0.0-alpha08"
// Test // Test
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.0.0-beta06" androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.0.0-beta07"
} }
static def generateVersionCode() { static def generateVersionCode() {

View file

@ -5,7 +5,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-alpha15' classpath 'com.android.tools.build:gradle:7.0.0-beta01'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong