fix the build

greyhairredbear · Jan 30, 2024 · 33c4b92 · 33c4b92
1 parent 8ccb981
commit 33c4b92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/buildSrc/src/main/kotlin/com/greyhairredbear/Dependencies.kt b/buildSrc/src/main/kotlin/com/greyhairredbear/Dependencies.kt
@@ -3,7 +3,6 @@ import Core.KOTLINX_GROUP
 import Versions.ACCOMPANIST_VERSION
 import Versions.ANDROID_MATERIAL_VERSION
 import Versions.ARROW_VERSION
-import Versions.BUILD_TOOLS_VERSION
 import Versions.COMPOSE_VERSION
 import Versions.DATASTORE_VERSION
 import Versions.HILT_VERSION
@@ -19,8 +18,7 @@ import Versions.PROTOBUF_VERSION
 import Versions.SUPPORT_ACTIVITY_VERSION
 
 object Versions {
-    const val JVM_TARGET = "11"
-    const val BUILD_TOOLS_VERSION = "8.2.0"
+    const val JVM_TARGET = "17"
     const val KOTLIN_COROUTINES_VERSION = "1.5.1"
 
     const val ARROW_VERSION = "1.0.0"

diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
@@ -1,25 +1,22 @@
-import com.google.protobuf.gradle.generateProtoTasks
-import com.google.protobuf.gradle.plugins
-import com.google.protobuf.gradle.protobuf
-import com.google.protobuf.gradle.protoc
-
 plugins {
     id(Plugins.ANDROID_LIBRARY)
     kotlin(Plugins.ANDROID)
     id(Plugins.PROTOBUF) version BuildPluginsVersions.PROTOBUF
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 android {
-    compileSdk = Sdk.COMPILE_SDK_VERSION
+    namespace = "com.greyhairredbear.racooin"
+
+    compileSdk = 34
 
     defaultConfig {
-        minSdk = Sdk.MIN_SDK_VERSION
-        targetSdk = Sdk.TARGET_SDK_VERSION
+        minSdk = 26
+        targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -35,13 +32,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     lint {
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        warningsAsErrors = true
+        abortOnError = true
     }
 }
 

diff --git a/persistence/src/main/AndroidManifest.xml b/persistence/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.greyhairredbear.persistence">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>