Skip to content

Commit 93777ad

Browse files
committed
update
1 parent 6ab2c76 commit 93777ad

File tree

94 files changed

+759
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+759
-708
lines changed

.github/workflows/android-release.yml.bak

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/ci_build_package.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

.github/workflows/ci_release_by_tag.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/ios-release.yml.bak

Lines changed: 0 additions & 41 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ migrate_working_dir/
2727
.dart_tool/
2828
.flutter-plugins
2929
.flutter-plugins-dependencies
30-
.packages
3130
.pub-cache/
3231
.pub/
3332
/build/
@@ -42,7 +41,3 @@ app.*.map.json
4241
/android/app/debug
4342
/android/app/profile
4443
/android/app/release
45-
46-
**/generated**
47-
**/Generated**
48-

.metadata

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
8-
channel: stable
7+
revision: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
17-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
16+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
17+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
1818
- platform: android
19-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
20-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
19+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
20+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
2121
- platform: ios
22-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
23-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
22+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
23+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
2424
- platform: linux
25-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
26-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
25+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
26+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
2727
- platform: macos
28-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
29-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
28+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
29+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
3030
- platform: web
31-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
32-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
31+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
32+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
3333
- platform: windows
34-
create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
35-
base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4
34+
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
35+
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
3636

3737
# User provided section
3838

analysis_options.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ linter:
1313
# The lint rules applied to this project can be customized in the
1414
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
1515
# included above or to enable additional rules. A list of all available lints
16-
# and their documentation is published at
17-
# https://dart-lang.github.io/linter/lints/index.html.
16+
# and their documentation is published at https://dart.dev/lints.
1817
#
1918
# Instead of disabling a lint rule for the entire project in the
2019
# section below, it can also be suppressed for a single line of code

android/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
1212
**/*.keystore
1313
**/*.jks

android/app/build.gradle

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,44 @@
1-
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
3-
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
5-
localProperties.load(reader)
6-
}
7-
}
8-
9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
15-
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
17-
}
18-
19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
20-
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id "dev.flutter.flutter-gradle-plugin"
226
}
237

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
288
android {
29-
compileSdkVersion flutter.compileSdkVersion
30-
ndkVersion flutter.ndkVersion
9+
namespace = "run.ikaros.app"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = flutter.ndkVersion
3112

3213
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_8
34-
targetCompatibility JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
3516
}
3617

3718
kotlinOptions {
38-
jvmTarget = '1.8'
39-
}
40-
41-
sourceSets {
42-
main.java.srcDirs += 'src/main/kotlin'
19+
jvmTarget = JavaVersion.VERSION_1_8
4320
}
4421

4522
defaultConfig {
4623
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
47-
applicationId "run.ikaros.app.ikaros_app"
24+
applicationId = "run.ikaros.app"
4825
// You can update the following values to match your application needs.
49-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
50-
minSdkVersion flutter.compileSdkVersion
51-
targetSdkVersion flutter.targetSdkVersion
52-
versionCode flutterVersionCode.toInteger()
53-
versionName flutterVersionName
26+
// For more information, see: https://flutter.dev/to/review-gradle-config.
27+
minSdk = flutter.minSdkVersion
28+
targetSdk = flutter.targetSdkVersion
29+
versionCode = flutter.versionCode
30+
versionName = flutter.versionName
5431
}
5532

5633
buildTypes {
5734
release {
5835
// TODO: Add your own signing config for the release build.
5936
// Signing with the debug keys for now, so `flutter run --release` works.
60-
signingConfig signingConfigs.debug
37+
signingConfig = signingConfigs.debug
6138
}
6239
}
6340
}
6441

6542
flutter {
66-
source '../..'
67-
}
68-
69-
dependencies {
70-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
43+
source = "../.."
7144
}

android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="run.ikaros.app.ikaros_app">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

0 commit comments

Comments
 (0)