Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

MacOs:
environment: Macos
runs-on: macos-15
runs-on: macos-15-intel
steps:
- name: Checkout Repo
uses: actions/checkout@v4
Expand All @@ -125,7 +125,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -301,7 +301,7 @@ jobs:
path: ./myWitWallet.apk

IOS:
runs-on: macos-15
runs-on: macos-15-intel
environment: IOS
steps:
- name: Checkout Repo
Expand All @@ -314,7 +314,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
run: ldd build/linux/x64/release/bundle/myWitWallet

MacOs:
runs-on: macos-15
runs-on: macos-15-intel
steps:
- name: Clone
uses: actions/checkout@v4
Expand All @@ -136,7 +136,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
subdirectory: 'android'

IOS:
runs-on: macos-15
runs-on: macos-15-intel
steps:
- name: Clone
uses: actions/checkout@v4
Expand All @@ -214,7 +214,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
architecture: x64
flutter-version: '3.32.0'
flutter-version: '3.38.3'
channel: 'stable'
cache: true

Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
/build/
# Web related
lib/generated_plugin_registrant.dart
lib/I18n/app_localizations.dart
lib/I18n/app_localizations_es.dart
lib/I18n/app_localizations_en.dart
lib/l10n/app_localizations.dart
lib/l10n/app_localizations_es.dart
lib/l10n/app_localizations_en.dart

# Symbolication related
app.*.symbols
Expand Down
34 changes: 27 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "org.jetbrains.kotlin.android"
id "dev.flutter.flutter-gradle-plugin"
}

// Force older AndroidX core libs so they work with AGP 8.6.x
configurations.all {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == "androidx.core"
&& (details.requested.name == "core" || details.requested.name == "core-ktx")) {
// 1.13.1 is pre 1.15/1.17 AAR-metadata strictness
details.useVersion "1.13.1"
details.because("Flutter 3.38 uses AGP 8.6.x, so we avoid androidx.core 1.17.0 which requires AGP 8.9.1")
}
if (details.requested.group == "androidx.browser"
&& details.requested.name == "browser") {
details.useVersion "1.8.0"
details.because("Avoid androidx.browser 1.9.0 which requires AGP 8.9.1 while Flutter pins 8.6.x")
}
if (details.requested.group == "net.bytebuddy"
&& details.requested.name == "byte-buddy") {
details.useVersion "1.14.10"
details.because("Avoid byte-buddy 1.17.6 which Jetifier cannot transform (unsupported class file major version 68)")
}
}
}
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand Down Expand Up @@ -34,10 +54,10 @@ def keystoreProperties = new Properties()
}

android {
compileSdkVersion 35
compileSdkVersion 36
namespace "io.witnet.myWitWallet"
testNamespace "io.witnet.myWitWalletTest"
ndkVersion = "26.3.11579264"
ndkVersion = "29.0.14206865"
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -51,8 +71,8 @@ android {

defaultConfig {
applicationId "io.witnet.myWitWallet"
minSdk 21
targetSdk 34
minSdkVersion flutter.minSdkVersion
targetSdk 36
multiDexEnabled true
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand All @@ -79,5 +99,5 @@ flutter {
}

dependencies {
implementation "com.android.support:multidex:1.0.3"
implementation "androidx.multidex:multidex:2.0.1"
}
5 changes: 5 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ subprojects {
}
}
}
if (project.name == "url_launcher_android") {
project.tasks.withType(Test).configureEach {
enabled = false
}
}
}
project.buildDir = "${rootProject.buildDir}/${project.name}"
project.evaluationDependsOn(':app')
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ org.gradle.parallel=true
org.gradle.caching=true
org.gradle.daemon=true
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
android.useDeprecatedNdk=true
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
6 changes: 3 additions & 3 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
id 'com.android.application' version '8.6.0' apply false
id 'com.android.library' version '8.6.0' apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
id 'com.android.application' version '8.9.1' apply false
id 'com.android.library' version '8.9.1' apply false
}

include ':app'
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
if config.base_configuration_reference.is_a? Xcodeproj::Project::Object::PBXFileReference
xcconfig_path = config.base_configuration_reference.real_path
IO.write(xcconfig_path, IO.read(xcconfig_path).gsub("DT_TOOLCHAIN_DIR", "TOOLCHAIN_DIR"))
Expand Down
6 changes: 2 additions & 4 deletions lib/screens/login/bloc/login_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
bool authenticated = await auth.authenticate(
localizedReason:
'Scan your fingerprint (or face or whatever) to authenticate',
options: const AuthenticationOptions(
stickyAuth: true,
biometricOnly: true,
),
persistAcrossBackgrounding: true,
biometricOnly: true,
);
if (authenticated) {
status = BiometricsStatus.autenticated;
Expand Down
Loading
Loading