From 5b88658916f7c68c3ddad6598efe026db3a8b290 Mon Sep 17 00:00:00 2001 From: Fernando Martin Garcia Del Angel Date: Mon, 17 Feb 2020 18:32:12 -0600 Subject: [PATCH] Revert "Resolved merging issues" This reverts commit bc9be35c62a0dae76819ad4901e35d8d4e6e43d1. --- .DS_Store | Bin 6148 -> 0 bytes .github/workflows/main.yml | 23 -- .idea/eightQueens.iml | 10 - .idea/libraries/Dart_Packages.xml | 6 - .idea/libraries/Flutter_Plugins.xml | 14 - .idea/workspace.xml | 318 ------------------ LICENSE | 201 +++++++++++ README.md | 41 ++- _config.yml | 1 + eight_queens/.flutter-plugins | 4 - eight_queens/.flutter-plugins-dependencies | 1 - eight_queens/.github/workflows/main.yml | 22 ++ eight_queens/.gitignore | 37 ++ eight_queens/.metadata | 10 + eight_queens/README.md | 16 + {android => eight_queens/android}/.gitignore | 0 .../executionHistory/executionHistory.bin | Bin 1379824 -> 0 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .../.gradle/5.6.2/fileChanges/last-build.bin | Bin 1 -> 0 bytes .../5.6.2/fileContent/fileContent.lock | Bin 17 -> 0 bytes .../.gradle/5.6.2/fileHashes/fileHashes.bin | Bin 142033 -> 0 bytes .../.gradle/5.6.2/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../5.6.2/fileHashes/resourceHashesCache.bin | Bin 19143 -> 0 bytes .../android/.gradle/5.6.2/gc.properties | 0 .../5.6.2/javaCompile/classAnalysis.bin | Bin 41022 -> 0 bytes .../.gradle/5.6.2/javaCompile/jarAnalysis.bin | Bin 64730 -> 0 bytes .../5.6.2/javaCompile/javaCompile.lock | Bin 17 -> 0 bytes .../.gradle/5.6.2/javaCompile/taskHistory.bin | Bin 38981 -> 0 bytes .../buildOutputCleanup.lock | Bin 17 -> 0 bytes .../buildOutputCleanup/cache.properties | 2 - .../buildOutputCleanup/outputFiles.bin | Bin 27569 -> 0 bytes .../android/.gradle/vcs-1/gc.properties | 0 .../android}/app/build.gradle | 0 .../app/src/debug/AndroidManifest.xml | 0 .../android}/app/src/main/AndroidManifest.xml | 0 .../plugins/GeneratedPluginRegistrant.java | 17 - .../com/martntn/eight_queens/MainActivity.kt | 0 .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 0 .../android}/build.gradle | 0 .../android}/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 0 eight_queens/android/gradlew | 160 --------- eight_queens/android/gradlew.bat | 90 ----- eight_queens/android/local.properties | 2 - .../android}/settings.gradle | 0 {ios => eight_queens/ios}/.gitignore | 0 .../ios}/Flutter/AppFrameworkInfo.plist | 0 .../ios}/Flutter/Debug.xcconfig | 0 eight_queens/ios/Flutter/Generated.xcconfig | 9 - .../ios}/Flutter/Release.xcconfig | 0 .../ios/Flutter/flutter_export_environment.sh | 10 - {ios => eight_queens/ios}/Podfile | 0 .../ios}/Runner.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../ios}/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 .../Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios}/Runner/Base.lproj/Main.storyboard | 0 .../ios/Runner/GeneratedPluginRegistrant.h | 17 - .../ios/Runner/GeneratedPluginRegistrant.m | 19 -- {ios => eight_queens/ios}/Runner/Info.plist | 0 .../ios}/Runner/Runner-Bridging-Header.h | 0 {lib => eight_queens/lib}/main.dart | 0 {lib => eight_queens/lib}/queens.dart | 0 {lib => eight_queens/lib}/results.dart | 0 pubspec.yaml => eight_queens/pubspec.yaml | 0 {test => eight_queens/test}/eight_test.dart | 0 {test => eight_queens/test}/widget_test.dart | 0 98 files changed, 318 insertions(+), 712 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .github/workflows/main.yml delete mode 100644 .idea/libraries/Flutter_Plugins.xml create mode 100644 LICENSE create mode 100644 _config.yml delete mode 100644 eight_queens/.flutter-plugins delete mode 100644 eight_queens/.flutter-plugins-dependencies create mode 100644 eight_queens/.github/workflows/main.yml create mode 100644 eight_queens/.gitignore create mode 100644 eight_queens/.metadata create mode 100644 eight_queens/README.md rename {android => eight_queens/android}/.gitignore (100%) delete mode 100644 eight_queens/android/.gradle/5.6.2/executionHistory/executionHistory.bin delete mode 100644 eight_queens/android/.gradle/5.6.2/executionHistory/executionHistory.lock delete mode 100644 eight_queens/android/.gradle/5.6.2/fileChanges/last-build.bin delete mode 100644 eight_queens/android/.gradle/5.6.2/fileContent/fileContent.lock delete mode 100644 eight_queens/android/.gradle/5.6.2/fileHashes/fileHashes.bin delete mode 100644 eight_queens/android/.gradle/5.6.2/fileHashes/fileHashes.lock delete mode 100644 eight_queens/android/.gradle/5.6.2/fileHashes/resourceHashesCache.bin delete mode 100644 eight_queens/android/.gradle/5.6.2/gc.properties delete mode 100644 eight_queens/android/.gradle/5.6.2/javaCompile/classAnalysis.bin delete mode 100644 eight_queens/android/.gradle/5.6.2/javaCompile/jarAnalysis.bin delete mode 100644 eight_queens/android/.gradle/5.6.2/javaCompile/javaCompile.lock delete mode 100644 eight_queens/android/.gradle/5.6.2/javaCompile/taskHistory.bin delete mode 100644 eight_queens/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 eight_queens/android/.gradle/buildOutputCleanup/cache.properties delete mode 100644 eight_queens/android/.gradle/buildOutputCleanup/outputFiles.bin delete mode 100644 eight_queens/android/.gradle/vcs-1/gc.properties rename {android => eight_queens/android}/app/build.gradle (100%) rename {android => eight_queens/android}/app/src/debug/AndroidManifest.xml (100%) rename {android => eight_queens/android}/app/src/main/AndroidManifest.xml (100%) delete mode 100644 eight_queens/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java rename {android => eight_queens/android}/app/src/main/kotlin/com/martntn/eight_queens/MainActivity.kt (100%) rename {android => eight_queens/android}/app/src/main/res/drawable/launch_background.xml (100%) rename {android => eight_queens/android}/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {android => eight_queens/android}/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {android => eight_queens/android}/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {android => eight_queens/android}/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {android => eight_queens/android}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {android => eight_queens/android}/app/src/main/res/values/styles.xml (100%) rename {android => eight_queens/android}/app/src/profile/AndroidManifest.xml (100%) rename {android => eight_queens/android}/build.gradle (100%) rename {android => eight_queens/android}/gradle.properties (100%) delete mode 100644 eight_queens/android/gradle/wrapper/gradle-wrapper.jar rename {android => eight_queens/android}/gradle/wrapper/gradle-wrapper.properties (100%) delete mode 100755 eight_queens/android/gradlew delete mode 100644 eight_queens/android/gradlew.bat delete mode 100644 eight_queens/android/local.properties rename {android => eight_queens/android}/settings.gradle (100%) rename {ios => eight_queens/ios}/.gitignore (100%) rename {ios => eight_queens/ios}/Flutter/AppFrameworkInfo.plist (100%) rename {ios => eight_queens/ios}/Flutter/Debug.xcconfig (100%) delete mode 100644 eight_queens/ios/Flutter/Generated.xcconfig rename {ios => eight_queens/ios}/Flutter/Release.xcconfig (100%) delete mode 100755 eight_queens/ios/Flutter/flutter_export_environment.sh rename {ios => eight_queens/ios}/Podfile (100%) rename {ios => eight_queens/ios}/Runner.xcodeproj/project.pbxproj (100%) rename {ios => eight_queens/ios}/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {ios => eight_queens/ios}/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename {ios => eight_queens/ios}/Runner.xcworkspace/contents.xcworkspacedata (100%) rename {ios => eight_queens/ios}/Runner/AppDelegate.swift (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename {ios => eight_queens/ios}/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename {ios => eight_queens/ios}/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename {ios => eight_queens/ios}/Runner/Base.lproj/Main.storyboard (100%) delete mode 100644 eight_queens/ios/Runner/GeneratedPluginRegistrant.h delete mode 100644 eight_queens/ios/Runner/GeneratedPluginRegistrant.m rename {ios => eight_queens/ios}/Runner/Info.plist (100%) rename {ios => eight_queens/ios}/Runner/Runner-Bridging-Header.h (100%) rename {lib => eight_queens/lib}/main.dart (100%) rename {lib => eight_queens/lib}/queens.dart (100%) rename {lib => eight_queens/lib}/results.dart (100%) rename pubspec.yaml => eight_queens/pubspec.yaml (100%) rename {test => eight_queens/test}/eight_test.dart (100%) rename {test => eight_queens/test}/widget_test.dart (100%) diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 9ca59b43de5ecf0878b282e8136ad4db7d8ed750..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyH3ME5S)b+k)Ut~<$VDX;s>lK6x4hG;D7+hkf0<5ojX2+im!y(2gsI%L`4C+ z*6#TBcJAaUymtU(w!J z{v*~nV*UZ`S-V^`?Xt02$N}->-OM)G$BKJ4tY2}Z1zFFy8uReR>en96$Qe?BR3H^d z1yX^3rT}}k+H}t`V=9meqyk?G=>MV673;vx(S98adVJUUiJ}_c?JhwqF|GqUN6yg1 zsYItrTrtGy%$KOE13O2jLu_ZR6FW=XP{ej;zF0Y=cFdRxqyj?)c70fB|39UFbN?Tb za+C_B0)I*Ynat1UGk#L^*3rjluPyXT`lqqh${7ZS01mVjANJ~szO$|l>>Q2GywQny N5KvvxQi0!4-~%V{EUN$j diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 5886f54..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,23 +0,0 @@ -on: push -name: Test, Build and Release apk -jobs: - build: - name: Build APK - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 - with: - java-version: '12.x' - - uses: subosito/flutter-action@v1 - with: - flutter-version: '1.12.x' - channel: 'stable' - - run: flutter pub get - - run: flutter test - - run: flutter build apk --debug --split-per-abi - - name: Create a Release APK - uses: ncipollo/release-action@v1 - with: - artifacts: "build/app/outputs/apk/debug/*.apk" - token: ${{ secrets.TOKEN }} diff --git a/.idea/eightQueens.iml b/.idea/eightQueens.iml index 20b7699..de9fce8 100644 --- a/.idea/eightQueens.iml +++ b/.idea/eightQueens.iml @@ -3,12 +3,6 @@ -<<<<<<< HEAD - - - -======= ->>>>>>> release/workingfinal @@ -17,9 +11,5 @@ -<<<<<<< HEAD - -======= ->>>>>>> release/workingfinal \ No newline at end of file diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index a648126..8e87c9a 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -226,8 +226,6 @@ -<<<<<<< HEAD -======= @@ -235,7 +233,6 @@ ->>>>>>> release/workingfinal @@ -281,10 +278,7 @@ -<<<<<<< HEAD -======= ->>>>>>> release/workingfinal diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml deleted file mode 100644 index cc85761..0000000 --- a/.idea/libraries/Flutter_Plugins.xml +++ /dev/null @@ -1,14 +0,0 @@ - - -<<<<<<< HEAD - - - - -======= - ->>>>>>> release/working-2 - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a3cf9bf..c9dbd98 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,82 +2,7 @@ -<<<<<<< HEAD -======= -<<<<<<< HEAD - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - -======= ->>>>>>> release/workingfinal - ->>>>>>> release/working-2 ->>>>>>> 9e328dfe3e823291b111abdaf39bbfd31f3f71cc