diff --git a/src/Application.cpp b/src/Application.cpp index c8226276..cfb2d665 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -250,22 +250,10 @@ namespace Bloom auto configFile = QFile(QString::fromStdString(Services::PathService::projectConfigPath())); if (!configFile.exists()) { - // Try looking for the old bloom.json config file - configFile.setFileName(QString::fromStdString(Services::PathService::projectDirPath()) + "/bloom.json"); - - if (configFile.exists()) { - Logger::warning( - "The recommended project configuration file format changed from JSON to YAML in Bloom v0.11.0." - " Bloom could not find a bloom.yaml configuration file, but did find bloom.json. Please convert" - " bloom.json to YAML format and rename to \"bloom.yaml\". There are numerous online JSON -> YAML" - " converters. For now, bloom.json will be used in the absence of bloom.yaml." - ); - - } else { - throw InvalidConfig( - "Bloom configuration file (bloom.yaml) not found. Working directory: " + Services::PathService::projectDirPath() - ); - } + throw Exception( + "Bloom configuration file (bloom.yaml) not found. Working directory: " + + Services::PathService::projectDirPath() + ); } if (!configFile.open(QIODevice::ReadOnly | QIODevice::Text)) { diff --git a/src/ProjectConfig.hpp b/src/ProjectConfig.hpp index c1646a83..196fc145 100644 --- a/src/ProjectConfig.hpp +++ b/src/ProjectConfig.hpp @@ -31,14 +31,6 @@ namespace Bloom * For more on project configuration, see Bloom documentation at https://bloom.oscillate.io/docs/configuration */ - /* - * Initially, we used the JSON format for project configuration files, but this was changed in version 0.11.0. - * See https://github.com/navnavnav/Bloom/issues/50 for more. - * - * Because JSON is a subset of YAML, we can (and do) fallback to bloom.json in the absence of bloom.yaml. - * See Application::loadProjectConfiguration() for more. - */ - /** * Configuration relating to a specific target. *