Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compose 1.0.1 #221

Merged
merged 2 commits into from
Aug 25, 2021
Merged

Compose 1.0.1 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72ce962
update to compose 1.0.1 / kt 1.5.21
FrancoisBlavoet Aug 15, 2021
7150792
update
FrancoisBlavoet Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ apply plugin: "com.github.ben-manes.versions"

buildscript {
ext {
kotlinVersion = '1.5.10'
kotlinVersion = '1.5.21'

versions = [:]
libraries = [:]
constants = [
minSdk : 21,
targetSdk : 29,
compileSdk : 29
targetSdk : 30,
compileSdk : 30
Comment on lines +12 to +13
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new compile sdk required by compose

]
}

Expand Down
11 changes: 5 additions & 6 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
androidXVersion = '1.1.0'
androidXVersion = '1.2.0'
androidTestVersion = "1.1.0"
androidJUnitVersion = "1.1.0"
lifecycleVersion = '2.0.0'
Expand All @@ -11,21 +11,20 @@ ext {
okhttpVersion = "3.13.1"
robolectricVersion = "4.1" // be aware of updating https://github.com/robolectric/robolectric/pull/4736
truthVersion = "1.0.1"
composeVersion = "1.0.0-beta08"
composeVersion = "1.0.1"

libraries = [
androidx : [
annotation : "androidx.annotation:annotation:$androidXVersion",
appcompat : "androidx.appcompat:appcompat:1.3.0",
appcompat : "androidx.appcompat:appcompat:1.3.1",
browser : "androidx.browser:browser:$androidXVersion",
core : [
ktx: "androidx.core:core-ktx:1.2.0"
ktx: "androidx.core:core-ktx:1.6.0"
],
activity : [
compose : "androidx.activity:activity-compose:1.3.0-alpha05"
compose : "androidx.activity:activity-compose:1.3.1"
],
compose : [
activity : "androidx.activity:activity-compose:1.3.0-alpha05",
foundation : "androidx.compose.foundation:foundation:$composeVersion",
material : "androidx.compose.material:material:$composeVersion",
rxjava3 : "androidx.compose.runtime:runtime-rxjava3:$composeVersion",
Expand Down
5 changes: 3 additions & 2 deletions formula-android-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ android {
}

composeOptions {
kotlinCompilerVersion "1.5.10"
kotlinCompilerExtensionVersion "1.0.0-beta08"
kotlinCompilerVersion constants.kotlinVersion
kotlinCompilerExtensionVersion composeVersion
Comment on lines +30 to +31
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: I tried to remove this, it was a big mistake .. I spent a while trying to figure out why the project was compiling with compose beta
The extension version at least seems mandatory

}

}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
Expand Down
4 changes: 2 additions & 2 deletions samples/stopwatch-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ android {
}

composeOptions {
kotlinCompilerVersion "1.5.10"
kotlinCompilerExtensionVersion "1.0.0-beta08"
kotlinCompilerVersion constants.kotlinVersion
kotlinCompilerExtensionVersion composeVersion
}

buildTypes {
Expand Down