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

[Quick View] Merging compose-latest to main #985

Merged
merged 43 commits into from
Oct 24, 2022
Merged

[Quick View] Merging compose-latest to main #985

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
40ad9dc
Merge pull request #919 from android/ben/merge_main_latest
bentrengrove Aug 5, 2022
c733b55
Upgrade to Compose 1.3
bentrengrove Aug 4, 2022
fbb1e66
Fix lint on JetNews
bentrengrove Aug 5, 2022
0f862df
Make reply work with upgrade script
bentrengrove Aug 5, 2022
f1ebfe3
Upgrade samples to compiler 1.3.0-rc02
bentrengrove Aug 8, 2022
12764b6
Merge pull request #918 from android/ben/1.3
JolandaVerhoef Aug 9, 2022
69f4ea7
Update compose-latest | Compose 1.3.0-alpha03 | Compiler 1.3.0 | Kotl…
JolandaVerhoef Aug 12, 2022
9302ed0
[compose-latest Crane] Bugfix for destinations not found in Crane (#939)
riggaroo Aug 15, 2022
dc6d23c
Merge branch 'main' into compose-latest
riggaroo Aug 23, 2022
58d8728
Main into Compose-latest (#965)
JolandaVerhoef Aug 24, 2022
d3aa517
[compose-latest] Update samples on compose-latest branch to Compose 1…
simona-anomis Aug 29, 2022
7a9fa37
[Jetsurvey] Converted to use Material 3 (#954) (#971)
IanGClifton Sep 2, 2022
c6812c6
Update to Compose 1.3.0-beta02 (#974)
bentrengrove Sep 10, 2022
172bd85
[All] Updated to Compose 1.3.0-beta03, AGP 7.3.0 (#979)
IanGClifton Sep 23, 2022
8ecabc5
main > compose-latest (#984)
JolandaVerhoef Sep 30, 2022
b83ce65
Ben/merge main into latest (#988)
bentrengrove Oct 3, 2022
4d17b11
Merge branch 'main' into ben/merge_main_into_latest2
bentrengrove Oct 5, 2022
f21dbbe
Merge main into latest (#991)
bentrengrove Oct 5, 2022
90145a6
[All] Update to 1.3.0-rc01-SNAP
astamato Sep 30, 2022
148b4d8
[All] Update to 1.3.0-rc01-SNAP
astamato Oct 5, 2022
734ab7f
[All] Update to 1.3.0-rc01-SNAP
astamato Oct 5, 2022
7bf22ba
[All] Update to 1.3.0-rc01-SNAP - Compose compiler 1.3.2
astamato Oct 5, 2022
90ee320
[All] Update Accompanist to 0.26.5-rc
astamato Oct 6, 2022
fab8511
[All] Update to 1.3.0-rc01 (#983)
astamato Oct 6, 2022
c278506
Updating Material3 to RC01
florina-muntenescu Oct 7, 2022
67e1e32
[All] Update all to material3 and compose-materialWindow to rc01
astamato Oct 7, 2022
1079eaa
Fix snapshot script not working on unix runners
bentrengrove Oct 7, 2022
b20ef93
Fix snapshot script not working on unix runners (#994)
bentrengrove Oct 7, 2022
b94906f
[All] Update to collectAsStateWithLifecycle to latest alpha
astamato Oct 8, 2022
fd05483
[All] Update to collectAsStateWithLifecycle to latest alpha
astamato Oct 8, 2022
0a3ac4d
Updating Material3 to RC01 (#993)
florina-muntenescu Oct 8, 2022
0a38a42
Update Jetcaster/README.md with correct refdoc
astamato Oct 10, 2022
9dad1d8
[All] Update to collectAsStateWithLifecycle to latest alpha (#995)
astamato Oct 10, 2022
316b8c6
[Jetsurvey] Removed Slider workaround for M3 bug
IanGClifton Oct 11, 2022
e56a368
[Jetsurvey] Removed Slider workaround for M3 bug (#998)
IanGClifton Oct 11, 2022
07b0a26
Merge remote-tracking branch 'origin/main' into compose-latest
JolandaVerhoef Oct 20, 2022
9c8064e
[All] Update non-compose dependencies
JolandaVerhoef Oct 20, 2022
2389cf5
[All] Update Compose dependencies to Snapshot
JolandaVerhoef Oct 20, 2022
47f4777
[All] Update dependencies to use Compose BOM
JolandaVerhoef Oct 20, 2022
1933558
[All] Update dependencies to use Compose BOM
JolandaVerhoef Oct 20, 2022
d526aaa
Merge main into compose-latest (#1002)
JolandaVerhoef Oct 20, 2022
7484956
[All] Revert faulty Androidx window library version update
JolandaVerhoef Oct 24, 2022
7659a1d
Update Compose version (#1003)
JolandaVerhoef Oct 24, 2022
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
Prev Previous commit
Next Next commit
[All] Update to 1.3.0-rc01-SNAP
  • Loading branch information
@astamato
astamato committed Oct 5, 2022
commit 90145a6ac1c93af75fcb35feb81fc0c781942788
4 changes: 2 additions & 2 deletions Crane/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
1 change: 1 addition & 0 deletions Crane/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencyResolutionManagement {

google()
mavenCentral()
maven { url = uri("https://androidx.dev/snapshots/builds/9119101/artifacts/repository") }
}
}
rootProject.name = "Crane"
Expand Down
4 changes: 2 additions & 2 deletions JetNews/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
1 change: 1 addition & 0 deletions JetNews/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencyResolutionManagement {

google()
mavenCentral()
maven { url = uri("https://androidx.dev/snapshots/builds/9119101/artifacts/repository") }
}
}
rootProject.name = "JetNews"
Expand Down
4 changes: 2 additions & 2 deletions Jetcaster/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
1 change: 1 addition & 0 deletions Jetcaster/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencyResolutionManagement {

google()
mavenCentral()
maven { url = uri("https://androidx.dev/snapshots/builds/9119101/artifacts/repository") }
}
}
rootProject.name = "Jetcaster"
Expand Down
4 changes: 2 additions & 2 deletions Jetchat/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
1 change: 1 addition & 0 deletions Jetchat/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencyResolutionManagement {

google()
mavenCentral()
maven { url = uri("https://androidx.dev/snapshots/builds/9119101/artifacts/repository") }
}
}
rootProject.name = "Jetchat"
Expand Down
4 changes: 2 additions & 2 deletions Jetsnack/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
1 change: 1 addition & 0 deletions Jetsnack/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencyResolutionManagement {

google()
mavenCentral()
maven { url = uri("https://androidx.dev/snapshots/builds/9119101/artifacts/repository") }
}
}
rootProject.name = "Jetsnack"
Expand Down
4 changes: 2 additions & 2 deletions Jetsurvey/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
16 changes: 16 additions & 0 deletions Jetsurvey/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
include(":app")
rootProject.name = "Jetsurvey"
4 changes: 2 additions & 2 deletions Owl/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
15 changes: 15 additions & 0 deletions Owl/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
include ':app'
4 changes: 2 additions & 2 deletions Reply/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down
1 change: 1 addition & 0 deletions Reply/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencyResolutionManagement {

google()
mavenCentral()
maven { url = uri("https://androidx.dev/snapshots/builds/9119101/artifacts/repository") }
}
}
rootProject.name = "Reply"
Expand Down
4 changes: 2 additions & 2 deletions scripts/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ androix-test-uiautomator = "2.2.0"
coil = "2.2.0"
# @keep
compileSdk = "33"
compose = "1.3.0-beta03"
compose = "1.3.0-SNAPSHOT"
compose-compiler = "1.3.1"
# @pin to be updated manually - check JetChat tests
compose-material3 = "1.0.0-beta03"
# @pin to be updated manually - check JetChat tests
compose-materialWindow = "1.0.0-beta03"
compose-snapshot = "-"
compose-snapshot = "9119101"
coroutines = "1.6.4"
google-maps = "18.1.0"
hilt = "2.43.2"
Expand Down