1 files changed, 46 insertions, 9 deletions

diff --git a/launcher/minecraft/GradleSpecifier.h b/launcher/minecraft/GradleSpecifier.h
index d9bb0207..27514ab9 100644
--- a/launcher/minecraft/GradleSpecifier.h
+++ b/launcher/minecraft/GradleSpecifier.h
@@ -1,7 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #pragma once
 
 #include <QString>
 #include <QStringList>
+#include <QRegularExpression>
 #include "DefaultVariable.h"
 
 struct GradleSpecifier
@@ -25,20 +61,21 @@ struct GradleSpecifier
          4 "jdk15"
          5 "jar"
         */
-        QRegExp matcher("([^:@]+):([^:@]+):([^:@]+)" "(?::([^:@]+))?" "(?:@([^:@]+))?");
-        m_valid = matcher.exactMatch(value);
+        QRegularExpression matcher(QRegularExpression::anchoredPattern("([^:@]+):([^:@]+):([^:@]+)" "(?::([^:@]+))?" "(?:@([^:@]+))?"));
+        QRegularExpressionMatch match = matcher.match(value);
+        m_valid = match.hasMatch();
         if(!m_valid) {
             m_invalidValue = value;
             return *this;
         }
-        auto elements = matcher.capturedTexts();
-        m_groupId = elements[1];
-        m_artifactId = elements[2];
-        m_version = elements[3];
-        m_classifier = elements[4];
-        if(!elements[5].isEmpty())
+        auto elements = match.captured();
+        m_groupId = match.captured(1);
+        m_artifactId = match.captured(2);
+        m_version = match.captured(3);
+        m_classifier = match.captured(4);
+        if(match.lastCapturedIndex() >= 5)
         {
-            m_extension = elements[5];
+            m_extension = match.captured(5);
         }
         return *this;
     }