Skip to content

Commit 1e1914a

Browse files
authored
🔀 Merge pull request #278 from AssistantNMS/develop
🔖 2.30.0
2 parents a5ae61c + ef877c4 commit 1e1914a

443 files changed

Lines changed: 193909 additions & 285429 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,8 @@ ios/build/*
8888
/android/releaseKey.properties
8989
desktop.ini
9090
/installers/AssistantNMS_setup.exe
91-
/assets/json/en-us
91+
/assets/json/en-us
92+
/android/release.properties
93+
android/app/build.gradle.kts
94+
android/app/.cxx/
95+
/android/build/

.metadata

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
7+
revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
17-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
16+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
17+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
1818
- platform: android
19-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
20-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
19+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
20+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2121
- platform: ios
22-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
23-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
22+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
23+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2424
- platform: linux
25-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
26-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
25+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
26+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2727
- platform: macos
28-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
29-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
28+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
29+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3030
- platform: web
31-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
32-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
31+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
32+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3333
- platform: windows
34-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
35-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
34+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
35+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3636

3737
# User provided section
3838

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cSpell.words": [
33
"assistantapps",
4+
"assistantnms",
45
"Colour",
56
"Colours",
67
"cupertino",

android/app/build.gradle

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

android/app/build.gradle.kts

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import java.util.Properties
2+
import java.io.FileInputStream
3+
4+
plugins {
5+
id("com.android.application")
6+
id("kotlin-android")
7+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
8+
id("dev.flutter.flutter-gradle-plugin")
9+
}
10+
11+
val keystoreProperties = Properties()
12+
val keystorePropertiesFile = rootProject.file("release.properties")
13+
if (keystorePropertiesFile.exists()) {
14+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
15+
}
16+
17+
if (System.getenv()["CI"] != null) { // CI=true is exported by Codemagic
18+
keystoreProperties["keyAlias"] = System.getenv()["FCI_KEY_ALIAS"]
19+
keystoreProperties["keyPassword"] = System.getenv()["FCI_KEY_PASSWORD"]
20+
keystoreProperties["storeFile"] = file(System.getenv()["FCI_BUILD_DIR"] + "/keystore.jks")
21+
keystoreProperties["storePassword"] = System.getenv()["FCI_KEYSTORE_PASSWORD"]
22+
}
23+
24+
android {
25+
namespace = "com.kurtlourens.no_mans_sky_recipes"
26+
compileSdk = flutter.compileSdkVersion
27+
// ndkVersion = flutter.ndkVersion
28+
ndkVersion = "27.0.12077973"
29+
30+
compileOptions {
31+
isCoreLibraryDesugaringEnabled = true
32+
sourceCompatibility = JavaVersion.VERSION_1_8
33+
targetCompatibility = JavaVersion.VERSION_1_8
34+
}
35+
36+
kotlinOptions {
37+
jvmTarget = JavaVersion.VERSION_1_8.toString()
38+
}
39+
40+
dexOptions {
41+
preDexLibraries = false
42+
incremental = true
43+
javaMaxHeapSize = "4g"
44+
}
45+
46+
defaultConfig {
47+
applicationId = "com.kurtlourens.no_mans_sky_recipes"
48+
// minSdk = flutter.minSdkVersion
49+
minSdk = 25
50+
targetSdk = flutter.targetSdkVersion
51+
versionCode = flutter.versionCode
52+
versionName = flutter.versionName
53+
multiDexEnabled = true
54+
}
55+
56+
signingConfigs {
57+
create("release") {
58+
keyAlias = keystoreProperties["keyAlias"] as String
59+
keyPassword = keystoreProperties["keyPassword"] as String
60+
storeFile = keystoreProperties["storeFile"]?.let { file(it) }
61+
storePassword = keystoreProperties["storePassword"] as String
62+
}
63+
}
64+
65+
buildTypes {
66+
release {
67+
signingConfig = signingConfigs.getByName("debug")
68+
signingConfig = signingConfigs.getByName("release")
69+
}
70+
}
71+
}
72+
73+
dependencies {
74+
// https://stackoverflow.com/questions/79158012/dependency-flutter-local-notifications-requires-core-library-desugaring-to-be
75+
// and https://mvnrepository.com/artifact/com.android.tools/desugar_jdk_libs
76+
// and https://developer.android.com/studio/write/java8-support#library-desugaring
77+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
78+
}
79+
80+
flutter {
81+
source = "../.."
82+
}

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="com.kurtlourens.no_mans_sky_recipes">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

android/app/src/main/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="com.kurtlourens.no_mans_sky_recipes">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<application android:label="Assistant for No Man's Sky" android:icon="@mipmap/ic_launcher"
43
android:roundIcon="@mipmap/ic_launcher_round" android:usesCleartextTraffic="true">
54
<activity android:exported="true"

android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.kurtlourens.no_mans_sky_recipes">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22
<!-- Flutter needs it to communicate with the running application
33
to allow setting breakpoints, to provide hot reload, etc.
44
-->

android/build.gradle

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

android/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
allprojects {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
}
6+
}
7+
8+
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
9+
rootProject.layout.buildDirectory.value(newBuildDir)
10+
11+
subprojects {
12+
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
13+
project.layout.buildDirectory.value(newSubprojectBuildDir)
14+
}
15+
subprojects {
16+
project.evaluationDependsOn(":app")
17+
}
18+
19+
tasks.register<Delete>("clean") {
20+
delete(rootProject.layout.buildDirectory)
21+
}

0 commit comments

Comments
 (0)