Bimba.git

diff --git a/app/build.gradle b/app/build.gradle
index ec6159fa7307a50723f1f71c85373d627595572a..b9de17b37f52e0d4b6c39c17b1f19a31b03728ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,12 +29,10 @@             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled true
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
+    kotlin {
+        jvmToolchain(8)
     }
     buildFeatures {
         viewBinding true




diff --git a/build.gradle b/build.gradle
index 73d1e088368f91b43d6e9b60b37550773df667cd..cbae33348107793265427b12db3a6c24e1a7f813 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.7.20' apply false
     id "org.jetbrains.kotlin.plugin.parcelize" version "1.8.20" apply false




diff --git a/fruchtfleisch/build.gradle b/fruchtfleisch/build.gradle
index e7ceb4cce7d2dcbc650fa806ead2fcfa26ba232e..17272883b14494e38349d5d38b74bc3e3efc24fe 100644
--- a/fruchtfleisch/build.gradle
+++ b/fruchtfleisch/build.gradle
@@ -3,10 +3,13 @@     id 'java-library'
     id 'org.jetbrains.kotlin.jvm'
 }
 
+kotlin {
+    jvmToolchain(8)
+}
+dependencies {
+    //implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10'
+}
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
-dependencies {
-    //implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10'
 }
\ No newline at end of file




diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 72a0f4c89357e1fdc5ad0b2d63031ab0a9475f5b..42fc8d468a93cc5dcfef291ae05846be0aec1eea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Aug 09 15:48:25 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME




diff --git a/gradle.properties b/gradle.properties
index cd0519bb2a9450033b80e5906f766b71d176014f..022338b784d7e75ffd098c926102cb3eafaabd01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file