Skip to content

Commit b581095

Browse files
committed
Update generate_crossword for flutter beta
1 parent 4731ae8 commit b581095

Some content is hidden

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

76 files changed

+1004
-1154
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

generate_crossword/step_02/linux/CMakeLists.txt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project-level configuration.
2-
cmake_minimum_required(VERSION 3.13)
2+
cmake_minimum_required(VERSION 3.10)
33
project(runner LANGUAGES CXX)
44

55
# The name of the executable created for the application. Change this to change
@@ -54,8 +54,25 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
5454
find_package(PkgConfig REQUIRED)
5555
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
5656

57-
# Application build; see runner/CMakeLists.txt.
58-
add_subdirectory("runner")
57+
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
58+
59+
# Define the application target. To change its name, change BINARY_NAME above,
60+
# not the value here, or `flutter run` will no longer work.
61+
#
62+
# Any new source files that you add to the application should be added here.
63+
add_executable(${BINARY_NAME}
64+
"main.cc"
65+
"my_application.cc"
66+
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
67+
)
68+
69+
# Apply the standard set of build settings. This can be removed for applications
70+
# that need different build settings.
71+
apply_standard_settings(${BINARY_NAME})
72+
73+
# Add dependency libraries. Add any application-specific dependencies here.
74+
target_link_libraries(${BINARY_NAME} PRIVATE flutter)
75+
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
5976

6077
# Run the Flutter tool portions of the build. This must not be removed.
6178
add_dependencies(${BINARY_NAME} flutter_assemble)

generate_crossword/step_04/linux/runner/my_application.cc renamed to generate_crossword/step_02/linux/my_application.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ static void my_application_class_init(MyApplicationClass* klass) {
117117
static void my_application_init(MyApplication* self) {}
118118

119119
MyApplication* my_application_new() {
120-
// Set the program name to the application ID, which helps various systems
121-
// like GTK and desktop environments map this running application to its
122-
// corresponding .desktop file. This ensures better integration by allowing
123-
// the application to be recognized beyond its binary name.
124-
g_set_prgname(APPLICATION_ID);
125-
126120
return MY_APPLICATION(g_object_new(my_application_get_type(),
127121
"application-id", APPLICATION_ID,
128122
"flags", G_APPLICATION_NON_UNIQUE,

generate_crossword/step_02/linux/runner/CMakeLists.txt

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

generate_crossword/step_02/pubspec.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ dependencies:
1616
intl: ^0.19.0
1717
riverpod: ^2.5.3
1818
riverpod_annotation: ^2.5.3
19-
two_dimensional_scrollables: ^0.3.2
19+
two_dimensional_scrollables: ^0.3.3
2020

2121
dev_dependencies:
2222
flutter_test:
2323
sdk: flutter
24-
flutter_lints: ^5.0.0
24+
flutter_lints: ^4.0.0
2525
build_runner: ^2.4.13
2626
built_value_generator: ^8.9.2
27-
custom_lint: ^0.6.10
28-
riverpod_generator: ^2.4.4
29-
riverpod_lint: ^2.3.14
27+
custom_lint: ^0.6.8
28+
riverpod_generator: ^2.4.3
29+
riverpod_lint: ^2.3.13
3030

3131
flutter:
3232
uses-material-design: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

generate_crossword/step_03/linux/CMakeLists.txt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project-level configuration.
2-
cmake_minimum_required(VERSION 3.13)
2+
cmake_minimum_required(VERSION 3.10)
33
project(runner LANGUAGES CXX)
44

55
# The name of the executable created for the application. Change this to change
@@ -54,8 +54,25 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
5454
find_package(PkgConfig REQUIRED)
5555
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
5656

57-
# Application build; see runner/CMakeLists.txt.
58-
add_subdirectory("runner")
57+
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
58+
59+
# Define the application target. To change its name, change BINARY_NAME above,
60+
# not the value here, or `flutter run` will no longer work.
61+
#
62+
# Any new source files that you add to the application should be added here.
63+
add_executable(${BINARY_NAME}
64+
"main.cc"
65+
"my_application.cc"
66+
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
67+
)
68+
69+
# Apply the standard set of build settings. This can be removed for applications
70+
# that need different build settings.
71+
apply_standard_settings(${BINARY_NAME})
72+
73+
# Add dependency libraries. Add any application-specific dependencies here.
74+
target_link_libraries(${BINARY_NAME} PRIVATE flutter)
75+
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
5976

6077
# Run the Flutter tool portions of the build. This must not be removed.
6178
add_dependencies(${BINARY_NAME} flutter_assemble)

0 commit comments

Comments
 (0)