fix: conflict

keep-starknet-strange · Oct 11, 2024 · fc4520b · fc4520b
2 parents 32d73c1 + d66b1de
commit fc4520b
Show file tree

Hide file tree

Showing 15 changed files with 472 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,11 @@
 **/.DS_Store
 
 # mdBook
-docs/book/
+docs/book/
+
+**/.gradle/*
+
+lightclientservice/app/build
+lightclientservice/target
+lightclientservice/local.properties
+lightclientservice/.idea
diff --git a/wallet_app/android/.idea/other.xml b/wallet_app/android/.idea/other.xml
diff --git a/wallet_app/android/app/build.gradle.kts b/wallet_app/android/app/build.gradle.kts
@@ -46,11 +46,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.1"

diff --git a/wallet_app/android/app/src/main/AndroidManifest.xml b/wallet_app/android/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.AccountBalanceActivity"
+        <activity android:name=".AccountBalanceActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>