diff --git a/final/app/src/main/java/com/example/rocketreserver/Apollo.kt b/final/app/src/main/java/com/example/rocketreserver/Apollo.kt index 699628d..26f53dd 100644 --- a/final/app/src/main/java/com/example/rocketreserver/Apollo.kt +++ b/final/app/src/main/java/com/example/rocketreserver/Apollo.kt @@ -1,8 +1,8 @@ package com.example.rocketreserver import android.util.Log -import com.apollographql.apollo3.ApolloClient -import com.apollographql.apollo3.network.okHttpClient +import com.apollographql.apollo.ApolloClient +import com.apollographql.apollo.network.okHttpClient import kotlinx.coroutines.delay import okhttp3.Interceptor import okhttp3.OkHttpClient diff --git a/final/app/src/main/java/com/example/rocketreserver/LaunchDetails.kt b/final/app/src/main/java/com/example/rocketreserver/LaunchDetails.kt index 2b44ba6..eb4f368 100644 --- a/final/app/src/main/java/com/example/rocketreserver/LaunchDetails.kt +++ b/final/app/src/main/java/com/example/rocketreserver/LaunchDetails.kt @@ -27,8 +27,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.apollographql.apollo3.api.Error -import com.apollographql.apollo3.exception.ApolloException +import com.apollographql.apollo.api.Error +import com.apollographql.apollo.exception.ApolloException import com.example.rocketreserver.LaunchDetailsState.ApplicationError import com.example.rocketreserver.LaunchDetailsState.Loading import com.example.rocketreserver.LaunchDetailsState.ProtocolError diff --git a/final/app/src/main/java/com/example/rocketreserver/LaunchList.kt b/final/app/src/main/java/com/example/rocketreserver/LaunchList.kt index 33a1f85..3d7551e 100644 --- a/final/app/src/main/java/com/example/rocketreserver/LaunchList.kt +++ b/final/app/src/main/java/com/example/rocketreserver/LaunchList.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.apollographql.apollo3.api.ApolloResponse -import com.apollographql.apollo3.api.Optional +import com.apollographql.apollo.api.ApolloResponse +import com.apollographql.apollo.api.Optional @Composable fun LaunchList(onLaunchClick: (launchId: String) -> Unit) { diff --git a/final/app/src/main/java/com/example/rocketreserver/MainActivity.kt b/final/app/src/main/java/com/example/rocketreserver/MainActivity.kt index 21a46ed..3c9b63f 100644 --- a/final/app/src/main/java/com/example/rocketreserver/MainActivity.kt +++ b/final/app/src/main/java/com/example/rocketreserver/MainActivity.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.res.stringResource import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.apollographql.apollo3.api.ApolloResponse +import com.apollographql.apollo.api.ApolloResponse import com.example.rocketreserver.ui.theme.RocketReserverTheme class MainActivity : ComponentActivity() { diff --git a/final/gradle/libs.versions.toml b/final/gradle/libs.versions.toml index d0a29ff..b70b888 100644 --- a/final/gradle/libs.versions.toml +++ b/final/gradle/libs.versions.toml @@ -11,7 +11,7 @@ composeBom = "2024.05.00" navigationCompose = "2.7.7" securityCrypto = "1.1.0-alpha06" coil = "2.6.0" -apollo = "4.0.0-beta.6" +apollo = "4.0.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -31,10 +31,10 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3" androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "securityCrypto" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } -apollo-runtime = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "apollo"} +apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo"} [plugins] android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -apollo = { id = "com.apollographql.apollo3", version.ref = "apollo" } +apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }