From cc7a375c8475ec783cc8ce4e7b039609dcc7102b Mon Sep 17 00:00:00 2001 From: Peti Date: Fri, 26 May 2023 19:42:35 +0200 Subject: [PATCH] ok megy elvileg egy darabig aztan maj dkiderul --- .idea/.gitignore | 3 +++ .idea/modules.xml | 8 ++++++++ .idea/naplo.iml | 9 +++++++++ .idea/vcs.xml | 10 ++++++++++ filcnaplo/android/app/build.gradle | 2 +- filcnaplo/android/gradle.properties | 1 + .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 8 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/modules.xml create mode 100644 .idea/naplo.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..becea5b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/naplo.iml b/.idea/naplo.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/naplo.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..b2035b9 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/build.gradle b/filcnaplo/android/app/build.gradle index 93221ea..f41fff5 100644 --- a/filcnaplo/android/app/build.gradle +++ b/filcnaplo/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file("$System.env.HOME/keys/filc3.properties") +def keystorePropertiesFile = rootProject.file("filc3.properties") keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { diff --git a/filcnaplo/android/gradle.properties b/filcnaplo/android/gradle.properties index 94adc3a..c5cc3d1 100644 --- a/filcnaplo/android/gradle.properties +++ b/filcnaplo/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +org.gradle.java.home=C:\Program Files\\Java\\jdk-14.0.2 diff --git a/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties b/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties index 90f271d..939efa2 100644 --- a/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties +++ b/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift b/filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift index a68520e..d61de2b 100644 --- a/filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,7 +9,7 @@ import connectivity_plus import dynamic_color import flutter_acrylic import flutter_local_notifications -import path_provider_macos +import path_provider_foundation import share_plus_macos import sqflite import url_launcher_macos