Skip to content

Commit 128b3a0

Browse files
authored
Merge pull request #471 from joreilly/dep_updates
version + people updates
2 parents dae7609 + e2c7831 commit 128b3a0

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

backend/src/jvmMain/kotlin/PeopleData.kt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,46 +33,46 @@ val currentPeopleInSpace = listOf(
3333
),
3434
Assignment(
3535
craft = "ISS",
36-
name = "Jonny Kim",
37-
personImageUrl ="https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/jonny2520kim_image_20200110161052.jpeg",
38-
personBio = "Jonathan Yong Kim is an American physician, Navy SEAL, and NASA astronaut of the class of 2017. He is a recipient of the Silver Star and a Bronze Star, and a graduate of the University of San Diego and Harvard Medical School.",
36+
name = "Christopher Williams",
37+
personImageUrl ="https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/255bauto255d__image_thumbnail_20240305190450.jpeg",
38+
personBio = "Christopher Williams grw up in Potomac, Maryland and graduated from Stanford University in 2005 with a bachelor’s degree in physics and a doctorate in physics from MIT in 2012, where his research was in astrophysics. Williams is a board-certified medical physicist, completing his residency training at Harvard Medical School before joining the faculty as a clinical physicist and researcher. He most recently worked as a medical physicist in the Radiation Oncology Department at the Brigham and Women's Hospital and Dana-Farber Cancer Institute in Boston. He was the lead physicist for the Institute’s MRI-guided adaptive radiation therapy program. His research focused on developing image guidance techniques for cancer treatments.",
3939
nationality = "American",
4040
),
4141
Assignment(
4242
craft = "ISS",
43-
name = "Sergey Ryzhikov",
44-
personImageUrl = "https://images.squarespace-cdn.com/content/v1/580e44a7c534a53b3fc3bedf/ffb6609c-6adb-40c6-8c5f-670472072acb/WIIS_Ryzhikov.jpg?format=1000w",
45-
personBio = "Sergey Nikolayevich Ryzhiko born on August 19, 1974, lieutenant colonel of Russian Air Force, is a Russian cosmonaut, selected in 2006. Ryzhikov launched on his first spaceflight onboard the Soyuz MS-02 spacecraft. He spent approximately six months onboard the International Space Station taking part in Expedition 49/50, returning to Earth on April 10, 2017.",
43+
name = "Sergey Kud-Sverchkov",
44+
personImageUrl = "https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/255bauto255d__image_thumbnail_20240305191157.jpeg",
45+
personBio = "Sergey Vladimirvich Kud-Sverchkov Is a Kazakh-Russian engineer and cosmonaut selected in 2010.",
4646
nationality = "Russian",
4747
),
4848
Assignment(
4949
craft = "ISS",
50-
name = "Alexey Zubritsky",
51-
personImageUrl = "https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/alexey_zubritsk_image_20240828194754.jpg",
52-
personBio = "Russian cosmonaut from the 2018 selection",
50+
name = "Sergey Mikayev",
51+
personImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Roscosmos_cosmonaut_Sergey_Mikaev_poses_for_a_portrait_at_NASA%27s_Johnson_Space_Center_%28jsc2024e077064_alt%29.jpg/960px-Roscosmos_cosmonaut_Sergey_Mikaev_poses_for_a_portrait_at_NASA%27s_Johnson_Space_Center_%28jsc2024e077064_alt%29.jpg",
52+
personBio = "Sergey Mikayev is a Russian cosmonaut affiliated with Roscosmos",
5353
nationality = "Russian",
5454
),
5555

5656

5757
Assignment(
5858
craft = "Tiangong",
59-
name = "Chen Dong",
60-
personImageUrl = "https://images.squarespace-cdn.com/content/v1/580e44a7c534a53b3fc3bedf/b07667e2-946d-44a9-891f-b6cf1ab65a1e/WIIS_ChenDong.jpg?format=1000w",
61-
personBio = "Chen Dong (simplified Chinese: 陈冬; traditional Chinese: 陳冬; pinyin: Chén Dōng; born 12 December 1978) is a Chinese pilot and astronaut selected as part of the Shenzhou program.\r\n\r\nHe was selected to fly on the Shenzhou 11 mission in October 2016 with astronaut Jing Haipeng. The two underwent more than 3,000 hours of training before the launch of the spacecraft. On 17 October 2016 On 07:30 local time (23:30 GMT on 16 October), Chen lifted off with Shenzhou 11 for a 33-day space mission to the Tiangong-2 space station as his first spaceflight, launched from the Jiuquan Satellite Launch Center using a Long March 2F launch rocket. The crew landed successfully after the 33 day mission on 18 November 2016, marking China's longest manned space flight to date. The reentry module of the Shenzhou-11 spacecraft landed in Inner Mongolia around 2.15 p.m(China time) after detaching from the space lab on 17 November.",
59+
name = "Zhang Lu",
60+
personImageUrl = "https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/zhang_lu_offici_image_thumbnail_20251030081918.jpeg",
61+
personBio = "Zhang Lu is a Chinese pilot selected in 2010 to be an astronaut.",
6262
nationality = "Chinese",
6363
),
6464
Assignment(
6565
craft = "Tiangong",
66-
name = "Chen Zhongrui",
67-
personImageUrl = "https://images.squarespace-cdn.com/content/v1/580e44a7c534a53b3fc3bedf/2b69f8d5-bb67-47b0-a659-d903ca09b675/WIIS_ChenZhongrui.jpg?format=1000w",
68-
personBio = "Chen Zhongrui is a Chinese pilot and astronaut selected as part of the Shenzhou program. He enlisted in the People's Liberation Army (PLA) Air Force in September 2003, and joined the Chinese Communist Party (CCP) in June 2005. He was a PLAAF flight instructor prior to joining the astronaut corps.",
66+
name = "Wu Fei",
67+
personImageUrl = "https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/fei_wu_image_thumbnail_20251030081821.jpeg",
68+
personBio = "Wu Fei is a Chinese astronaut selected as part of the Shenzhou program. He enlisted in the People's Liberation Army (PLA) Air Force in January 2021, and joined the Chinese Communist Party (CCP) in October 2015. He was a engineer at the China Academy of Space Technology (CAST) prior to joining the astronaut corps.",
6969
nationality = "Chinese",
7070
),
7171
Assignment(
7272
craft = "Tiangong",
73-
name = "Wang Jie",
74-
personImageUrl = "https://images.squarespace-cdn.com/content/v1/580e44a7c534a53b3fc3bedf/16dda7cc-ca7d-4d7b-85b8-4f6615dfacc8/WIIS_WangJie.jpg?format=1000w",
75-
personBio = "Wang Jie is a Chinese astronaut selected as part of the Shenzhou program. He joined the Chinese Communist Party (CCP) in June 2009 and enlisted in the People's Liberation Army (PLA) in January 2021. Prior to being chosen into the astronaut corps, he worked as a engineer at the China Aerospace Science and Technology Corporation (CASC).",
73+
name = "Hongzhang Zhang",
74+
personImageUrl = "https://thespacedevs-prod.nyc3.digitaloceanspaces.com/media/images/hongzhang_zhang_image_thumbnail_20251030081806.jpeg",
75+
personBio = "Zhang Hongzhang is a Chinese astronaut selected as a payload specialist as part of the Shenzhou program. He joined the Chinese Communist Party (CCP) in August 2004. He was a researcher on battery technology at the Chinese Academy of Sciences (CAS) Dalian Institute of Chemical Physics prior to joining the astronaut corps.",
7676
nationality = "Chinese",
7777
),
7878

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ plugins {
1414
allprojects {
1515
configurations.all {
1616
resolutionStrategy {
17-
force("org.jetbrains.kotlin:kotlin-test:2.2.21")
18-
force("org.jetbrains.kotlin:kotlin-test-common:2.2.21")
19-
force("org.jetbrains.kotlin:kotlin-test-annotations-common:2.2.21")
17+
force("org.jetbrains.kotlin:kotlin-test:2.3.0")
18+
force("org.jetbrains.kotlin:kotlin-test-common:2.3.0")
19+
force("org.jetbrains.kotlin:kotlin-test-annotations-common:2.3.0")
2020
}
2121
}
2222
}

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.2.21"
2+
kotlin = "2.3.0"
33
ksp = "2.3.2"
44

55
compose-multiplatform = "1.9.3"
@@ -23,10 +23,10 @@ webPackPlugin = "9.1.0"
2323
remoteCompose = "1.0.0-SNAPSHOT"
2424

2525

26-
androidxActivity = "1.12.1"
27-
androidxComposeBom = "2025.12.00"
26+
androidxActivity = "1.12.2"
27+
androidxComposeBom = "2025.12.01"
2828
material3-adaptive = "1.3.0-alpha05"
29-
material3-adaptive-navigation-suite = "1.5.0-alpha10"
29+
material3-adaptive-navigation-suite = "1.5.0-alpha11"
3030
androidxNavigationCompose = "2.9.6"
3131
uiToolingPreview = "1.10.0"
3232
wearCompose = "1.5.6"
@@ -42,8 +42,8 @@ okhttp = "5.3.2"
4242
kermit = "2.0.8"
4343

4444
gradleVersionsPlugin = "0.53.0"
45-
shadowPlugin = "9.2.2"
46-
skie = "0.10.8"
45+
shadowPlugin = "9.3.1"
46+
skie = "0.10.9"
4747

4848
mcp = "0.8.1"
4949

0 commit comments

Comments
 (0)