fix building with haven
OmarHatem committed
Nov 25, 2024 at 21:05 UTC
83cfc7dd703c04613c6b83f2a9234a3c98229660
7 files changed
+35
-6
cw_haven/android/build.gradle
+15
-3
@@ -2,14 +2,14 @@ group 'com.cakewallet.cw_haven'
2
version '1.0-SNAPSHOT'
3
4
buildscript {
5
- ext.kotlin_version = '1.7.10'
5
+ ext.kotlin_version = '2.0.21'
6
repositories {
7
google()
8
mavenCentral()
9
}
10
11
dependencies {
12
- classpath 'com.android.tools.build:gradle:7.3.0'
12
+ classpath 'com.android.tools.build:gradle:8.7.1'
13
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14
}
15
}
@@ -25,8 +25,20 @@ apply plugin: 'com.android.library'
25
apply plugin: 'kotlin-android'
26
27
android {
28
- compileSdkVersion 28
28
+ compileSdkVersion 33
29
30
+ if (project.android.hasProperty("namespace")) {
31
+ namespace 'com.cakewallet.cw_haven'
32
+ }
33
+
34
+ compileOptions {
35
+ sourceCompatibility JavaVersion.VERSION_17
36
+ targetCompatibility JavaVersion.VERSION_17
37
+ }
38
+
39
+ kotlinOptions {
40
+ jvmTarget = '17'
41
+ }
42
sourceSets {
43
main.java.srcDirs += 'src/main/kotlin'
44
}
cw_shared_external/android/build.gradle
+14
-1
@@ -25,7 +25,20 @@ apply plugin: 'com.android.library'
25
apply plugin: 'kotlin-android'
26
27
android {
28
- compileSdkVersion 30
28
+ compileSdkVersion 33
29
+
30
+ if (project.android.hasProperty("namespace")) {
31
+ namespace 'com.cakewallet.cw_shared_external'
32
+ }
33
+
34
+ compileOptions {
35
+ sourceCompatibility JavaVersion.VERSION_17
36
+ targetCompatibility JavaVersion.VERSION_17
37
+ }
38
+
39
+ kotlinOptions {
40
+ jvmTarget = '17'
41
+ }
42
43
sourceSets {
44
main.java.srcDirs += 'src/main/kotlin'
linux/flutter/generated_plugins.cmake
+1
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
10
)
11
12
list(APPEND FLUTTER_FFI_PLUGIN_LIST
13
+ sp_scanner
14
)
15
16
set(PLUGIN_BUNDLED_LIBRARIES)
macos/Flutter/GeneratedPluginRegistrant.swift
+2
@@ -6,6 +6,7 @@ import FlutterMacOS
6
import Foundation
7
8
import connectivity_plus
9
+import cw_mweb
10
import device_info_plus
11
import devicelocale
12
import fast_scanner
@@ -23,6 +24,7 @@ import wakelock_plus
24
25
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
26
ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
27
+ CwMwebPlugin.register(with: registry.registrar(forPlugin: "CwMwebPlugin"))
28
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
29
DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
30
MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
pubspec_base.yaml
+1
-1
@@ -26,7 +26,7 @@ dependencies:
26
share_plus: ^10.0.0
27
# date_range_picker: ^1.0.6
28
#https://api.flutter.dev/flutter/material/showDateRangePicker.html
29
- dio: ^4.0.6
29
+ dio: ^5.7.0
30
hive: ^2.2.3
31
hive_flutter: ^1.1.0
32
local_auth_android: ^1.0.46
scripts/android/inject_app_details.sh
+1
-1
@@ -6,10 +6,10 @@ if [ -z "$APP_ANDROID_TYPE" ]; then
6
fi
7
8
cd ../..
9
+set -x
10
universal_sed "1,/version:/ {s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/;}" ./pubspec.yaml
11
universal_sed "1,/version:/ {s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/;}" ./android/app/src/main/AndroidManifest.xml
12
universal_sed "1,/__APP_SCHEME__/ {s/__APP_SCHEME__/${APP_ANDROID_SCHEME}/;}" ./android/app/src/main/AndroidManifest.xml
13
universal_sed "1,/version:/ {s/__versionCode__/${APP_ANDROID_BUILD_NUMBER}/;}" ./android/app/src/main/AndroidManifest.xml
14
universal_sed "1,/version:/ {s/__versionName__/${APP_ANDROID_VERSION}/;}" ./android/app/src/main/AndroidManifest.xml
14
-
15
cd scripts/android
windows/flutter/generated_plugins.cmake
+1
@@ -14,6 +14,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
14
)
15
16
list(APPEND FLUTTER_FFI_PLUGIN_LIST
17
+ sp_scanner
18
)
19
20
set(PLUGIN_BUNDLED_LIBRARIES)