diff --git a/app/.gitignore b/app/.gitignore index 24fd7c0..8e3d472 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -10,3 +10,4 @@ .cxx local.properties app/build +*.jks diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 055dac7..670ad31 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -17,8 +17,22 @@ android { versionName = "0.1.0" } + signingConfigs { + create("release") { + storeFile = file("../haushalt.jks") + storePassword = "haushalt123" + keyAlias = "haushalt" + keyPassword = "haushalt123" + } + } + buildTypes { + debug { + buildConfigField("String", "BASE_URL", "\"http://192.168.178.34:8080/\"") + } release { + signingConfig = signingConfigs.getByName("release") + buildConfigField("String", "BASE_URL", "\"https://haushalt.marha.de/\"") isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), diff --git a/app/app/src/main/java/de/haushalt/app/data/ApiClient.kt b/app/app/src/main/java/de/haushalt/app/data/ApiClient.kt index 9de2e72..3ee0880 100644 --- a/app/app/src/main/java/de/haushalt/app/data/ApiClient.kt +++ b/app/app/src/main/java/de/haushalt/app/data/ApiClient.kt @@ -1,5 +1,6 @@ package de.haushalt.app.data +import de.haushalt.app.BuildConfig import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient @@ -8,8 +9,8 @@ import retrofit2.Retrofit import retrofit2.converter.kotlinx.serialization.asConverterFactory object ApiClient { - const val BASE_URL = "http://192.168.178.34:8080/" - private const val API_URL = "${BASE_URL}api/" + val BASE_URL = BuildConfig.BASE_URL + private val API_URL = "${BASE_URL}api/" private val json = Json { ignoreUnknownKeys = true diff --git a/app/app/src/main/java/de/haushalt/app/data/TaskSchemaApi.kt b/app/app/src/main/java/de/haushalt/app/data/TaskSchemaApi.kt index 63936d8..1b4e952 100644 --- a/app/app/src/main/java/de/haushalt/app/data/TaskSchemaApi.kt +++ b/app/app/src/main/java/de/haushalt/app/data/TaskSchemaApi.kt @@ -16,7 +16,7 @@ interface TaskSchemaApi { suspend fun get(@Path("id") id: Int): TaskSchema @POST("task-schemas") - suspend fun create(@Body body: TaskSchemaRequest): TaskSchema + suspend fun create(@Body body: TaskSchemaRequest) @PUT("task-schemas/{id}") suspend fun update(@Path("id") id: Int, @Body body: TaskSchemaRequest): TaskSchema diff --git a/backend/public/app/haushalt.apk b/backend/public/app/haushalt.apk index abd50af..a63bd33 100644 Binary files a/backend/public/app/haushalt.apk and b/backend/public/app/haushalt.apk differ diff --git a/backend/public/app/version.json b/backend/public/app/version.json index cd50910..6fc8497 100644 --- a/backend/public/app/version.json +++ b/backend/public/app/version.json @@ -1,4 +1,4 @@ { - "versionCode": 2, + "versionCode": 3, "apkFile": "haushalt.apk" }