Skip to content
Snippets Groups Projects
Commit 2f180d2d authored by poka's avatar poka
Browse files

upgrade to flutter 3.19.3

parent 41dcf912
No related branches found
No related tags found
No related merge requests found
Pipeline #36474 waiting for manual action
plugins {
id 'com.android.application'
id 'kotlin-android'
id "dev.flutter.flutter-gradle-plugin"
}
def localProperties = new Properties() def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties') def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) { if (localPropertiesFile.exists()) {
...@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { ...@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
} }
} }
def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new RuntimeException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = localProperties.getProperty('flutter.versionCode') def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) { if (flutterVersionCode == null) {
flutterVersionCode = '1' flutterVersionCode = '1'
...@@ -21,10 +22,6 @@ if (flutterVersionName == null) { ...@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0' flutterVersionName = '1.0'
} }
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
def keystoreProperties = new Properties() def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties') def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) { if (keystorePropertiesFile.exists()) {
...@@ -32,21 +29,30 @@ if (keystorePropertiesFile.exists()) { ...@@ -32,21 +29,30 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdkVersion 33 namespace "gecko.axiomteam.fr"
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
sourceSets { compileOptions {
main.java.srcDirs += 'src/main/kotlin' sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions { kotlinOptions {
disable 'InvalidPackage' jvmTarget = '1.8'
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
} }
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "gecko.axiomteam.fr" applicationId "gecko.axiomteam.fr"
minSdkVersion 19 // You can update the following values to match your application needs.
targetSdkVersion 33 // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
multiDexEnabled true multiDexEnabled true
...@@ -65,7 +71,7 @@ android { ...@@ -65,7 +71,7 @@ android {
release { release {
// TODO: Add your own signing config for the release build. // TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works. // Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.release //poka: comment this to build unsigned release, or set to signingConfigs.debug to sign with debug keys signingConfig signingConfigs.release
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
...@@ -76,11 +82,9 @@ android { ...@@ -76,11 +82,9 @@ android {
} }
} }
flutter { flutter {
source '../..' source '../..'
} }
dependencies { dependencies {}
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.work:work-runtime-ktx:2.7.0'
}
buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }
......
include ':app' pluginManagement {
def flutterSdkPath = {
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties() def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
def flutterSdkPath = properties.getProperty("flutter.sdk") def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties" assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" return flutterSdkPath
}
settings.ext.flutterSdkPath = flutterSdkPath()
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
}
include ":app"
...@@ -44,9 +44,9 @@ class DragTuleAction extends StatelessWidget { ...@@ -44,9 +44,9 @@ class DragTuleAction extends StatelessWidget {
), ),
), ),
child: DragTarget<String>( child: DragTarget<String>(
onAccept: (senderAddress) async { onAcceptWithDetails: (senderAddress) async {
final walletData = final walletData =
myWalletProvider.getWalletDataByAddress(senderAddress); myWalletProvider.getWalletDataByAddress(senderAddress.data);
await sub.setCurrentWallet(walletData!); await sub.setCurrentWallet(walletData!);
sub.reload(); sub.reload();
paymentPopup(context, wallet.address, paymentPopup(context, wallet.address,
...@@ -58,7 +58,8 @@ class DragTuleAction extends StatelessWidget { ...@@ -58,7 +58,8 @@ class DragTuleAction extends StatelessWidget {
myWalletProvider.reload(); myWalletProvider.reload();
} }
}, },
onWillAccept: (senderAddress) => senderAddress != wallet.address, onWillAcceptWithDetails: (senderAddress) =>
senderAddress.data != wallet.address,
builder: ( builder: (
BuildContext context, BuildContext context,
List<dynamic> accepted, List<dynamic> accepted,
......
This diff is collapsed.
...@@ -5,7 +5,7 @@ description: Pay with G1. ...@@ -5,7 +5,7 @@ description: Pay with G1.
# pub.dev using `pub publish`. This is preferred for private packages. # pub.dev using `pub publish`. This is preferred for private packages.
publish_to: "none" # Remove this line if you wish to publish to pub.dev publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 0.1.4+71 version: 0.1.5+72
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.12.0 <3.0.0"
...@@ -51,13 +51,13 @@ dependencies: ...@@ -51,13 +51,13 @@ dependencies:
hex: ^0.2.0 hex: ^0.2.0
accordion: ^2.6.0 accordion: ^2.6.0
flutter_svg: ^2.0.9 flutter_svg: ^2.0.9
pinenacl: ^0.3.4 pinenacl: ^0.5.1
fast_base58: ^0.2.1 fast_base58: ^0.2.1
tutorial_coach_mark: ^1.2.11 tutorial_coach_mark: ^1.2.11
confetti: ^0.7.0 confetti: ^0.7.0
url_launcher: ^6.2.2 url_launcher: ^6.2.2
crypto: ^3.0.3 crypto: ^3.0.3
screen_brightness: ^0.2.2+1 screen_brightness: ^1.0.0
uuid: ^3.0.7 uuid: ^3.0.7
fade_and_translate: ^0.1.3 fade_and_translate: ^0.1.3
...@@ -72,7 +72,6 @@ dev_dependencies: ...@@ -72,7 +72,6 @@ dev_dependencies:
sdk: flutter sdk: flutter
integration_test: integration_test:
sdk: flutter sdk: flutter
dart_code_metrics: ^5.7.6
icons_launcher: icons_launcher:
image_path: "assets/icon/gecko_flat.png" image_path: "assets/icon/gecko_flat.png"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment