From 40925bc3826ff4e9858a53bd7c96278003bd9b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Mari=C4=87?= <206777381+nikola-maric-aula@users.noreply.github.com> Date: Thu, 3 Sep 2026 14:41:53 +0200 Subject: [PATCH 1/2] fix: duplicate class issue when building --- android/.idea/compiler.xml | 2 +- android/.idea/misc.xml | 3 ++- android/app/build.gradle | 2 +- android/build.gradle | 4 ++-- android/gradle/wrapper/gradle-wrapper.properties | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml index b86273d94..e5114f95b 100644 --- a/android/.idea/compiler.xml +++ b/android/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml index f7608edae..05156b26e 100644 --- a/android/.idea/misc.xml +++ b/android/.idea/misc.xml @@ -1,4 +1,5 @@ + - + \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 40a787bba..342b63f65 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -19,7 +19,7 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } diff --git a/android/build.gradle b/android/build.gradle index 4e7cdc7c4..703bc96dd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,8 +7,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.9.2' - classpath 'com.google.gms:google-services:4.4.2' + classpath 'com.android.tools.build:gradle:9.3.2' + classpath 'com.google.gms:google-services:4.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index c1d5e0185..d24973462 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Mon Aug 31 12:35:37 CEST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From ed8fb339d6bed5178cfcfe4a611c220010cd7f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Mari=C4=87?= <206777381+nikola-maric-aula@users.noreply.github.com> Date: Thu, 3 Sep 2026 14:43:47 +0200 Subject: [PATCH 2/2] feat: enable SSO in the app --- .env.app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.app b/.env.app index 4e2b3e306..0cb423ddd 100644 --- a/.env.app +++ b/.env.app @@ -1,7 +1,7 @@ VITE_APP_VERSION = $npm_package_version VITE_APP_API_URL = https://neu.aula.de VITE_APP_MULTI = true -VITE_APP_IS_SSO_ENABLED = false +VITE_APP_IS_SSO_ENABLED = true VITE_APP_BASENAME = / # vim: set ft=sh: