Fixes after merging with main branch; rename miniDsn to miniDns

network/data/build.gradle.kts

@@ -47,7 +47,7 @@ dependencies {
         `android-annotation`,
         `apacheCommon-codec`,
         `gotev-cookieStore`,
-        `miniDsn`,
+        `miniDns`,
         `okHttp-logging`,
         `okhttp-url-connection`,
         `retrofit`,

plugins/core/src/main/kotlin/Dependencies.kt

@@ -63,8 +63,8 @@ public val DependencyHandler.`compose-ui-test-junit`: Any
 // endregion
 
 // Network
-public val DependencyHandler.miniDsn: Any
-    get() = dependency("org.minidns", module = "minidns-hla") version `miniDsn version`
+public val DependencyHandler.miniDns: Any
+    get() = dependency("org.minidns", module = "minidns-hla") version `miniDns version`
 public val DependencyHandler.`retrofit-scalars-converter`: Any
     get() = squareup("retrofit2", "converter-scalars") version `retrofit version`
 public val DependencyHandler.`okhttp-url-connection`: Any

plugins/core/src/main/kotlin/me/proton/core/gradle/convention/kotlin/KotlinConvention.kt

@@ -28,10 +28,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 internal class KotlinConvention : BuildConvention<KotlinConventionSettings> {
     private val defaultCompilerArgs: List<String>
         get() = listOf(
-            "-XXLanguage:+NewInference",
-            // Enables inline classes
-            "-XXLanguage:+InlineClasses",
-            // Enables experimental Coroutines from coroutines-test artifact, like `runBlockingTest`
             "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
             "-Xopt-in=kotlin.time.ExperimentalTime"

plugins/core/src/main/kotlin/me/proton/core/gradle/plugin/BuildConventionPlugin.kt

@@ -22,12 +22,14 @@ import applyRepositories
 import initVersions
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
 import javax.annotation.OverridingMethodsMustInvokeSuper
 
 public abstract class BuildConventionPlugin : Plugin<Project> {
     @OverridingMethodsMustInvokeSuper
     override fun apply(target: Project) {
-        initVersions()
+        initVersions(target.rootProject.extensions.getByType<VersionCatalogsExtension>().named("libs"))
         target.applyRepositories()
     }
 }

plugins/core/src/main/kotlin/me/proton/core/gradle/plugin/RootProjectPlugin.kt

@@ -16,6 +16,8 @@
  * along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+package me.proton.core.gradle.plugin
+
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 

plugins/core/src/main/kotlin/versionsConfig.kt

@@ -75,7 +75,7 @@ public const val `apacheCommon-codec version`: String =    "1.15"
 public const val `bcrypt version`: String =                "0.9.0"             // Released: Oct 29, 2019
 public const val `gotev-cookieStore version`: String =     "1.4.0"
 public const val `googleTink version`: String =            "1.6.1"             // Released: Oct 15, 2020
-public const val `miniDsn version`: String =               "1.0.0"             // Released: Jul 18, 2020
+public const val `miniDns version`: String =               "1.0.0"             // Released: Jul 18, 2020
 public const val `okHttp version`: String =                "4.9.1"
 public const val `okHttp-url-connection version`: String = "4.9.1"
 public const val `trustKit version`: String =              "1.1.5"