Gradle 7.5, AGP 7.4.2, moko resources 0.23.0

androidHyperskillApp/build.gradle.kts

@@ -84,10 +84,13 @@ dependencies {
 }
 
 android {
+    val applicationPackage = "org.hyperskill.app.android"
+    namespace = applicationPackage
+
     compileSdk = appVersions.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        applicationId = "org.hyperskill.app.android"
+        applicationId = applicationPackage
         minSdk = appVersions.versions.minSdk.get().toInt()
         targetSdk = appVersions.versions.targetSdk.get().toInt()
         versionCode = appVersions.versions.versionCode.get().toInt()

androidHyperskillApp/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.hyperskill.app.android">
+    >
 
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

androidHyperskillApp/src/main/java/org/hyperskill/app/android/profile/view/fragment/ProfileFragment.kt

@@ -12,6 +12,7 @@ import coil.ImageLoader
 import coil.load
 import coil.result
 import coil.transform.CircleCropTransformation
+import org.hyperskill.app.SharedResources
 import org.hyperskill.app.android.HyperskillApp
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.badges.view.delegate.ProfileBadgesDelegate
@@ -100,6 +101,7 @@ class ProfileFragment :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        SharedResources.colors.color_brown.getColor(requireContext())
         injectComponents()
         notificationPermissionDelegate = NotificationPermissionDelegate(this, ::onNotificationPermissionResult)
     }

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-androidGradlePlugin = '7.2.2'
+androidGradlePlugin = "7.4.2"
 kotlin = '1.8.22'
 kotlinCoroutines = '1.7.2'
 ktor = '2.3.3'
-mokoResources = "0.20.1"
+mokoResources = "0.23.0"
 mokoKswift = "0.6.1"
 ktlintRules = '1.0.0'
 adapters = '1.1.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Nov 10 21:02:04 MSK 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

iosHyperskillApp/iosHyperskillApp/Sources/Extensions/ThirdParty/MokoResources/ResourcesColorResourceThemed+UIColor.swift

@@ -1,8 +1,35 @@
 import shared
 import UIKit
 
-extension ResourcesColorResource.Themed {
+extension ColorDesc {
+    var uiColor: UIColor {
+        switch self {
+        case let descResource as ColorDescResource:
+            return descResource.resource.getUIColor()
+        case let singleColor as ColorDescSingle:
+            return singleColor.color.uiColor
+        case let themedColor as ColorDescThemed:
+            return themedColor.dynamicUIColor
+        default:
+            return UIColor(hex6: 0xffffff)
+        }
+    }
+}
+
+extension ColorDescThemed {
     var dynamicUIColor: UIColor {
-        UIColor.dynamic(light: self.light.uiColor, dark: self.dark.uiColor)
+        UIColor.dynamic(light: self.lightColor.uiColor, dark: self.darkColor.uiColor)
+    }
+}
+
+private struct ColorHandlingError : LocalizedError {
+    let description: String
+
+    init(_ description: String) {
+        self.description = description
+    }
+
+    var errorDescription: String? {
+        description
     }
 }

iosHyperskillApp/iosHyperskillApp/Sources/Extensions/ThirdParty/MokoResources/ResourcesStringResource+Localized.swift

@@ -1,7 +1,7 @@
 import Foundation
 import shared
 
-extension ResourcesStringResource {
+extension StringResource {
     func localized() -> String {
         // swiftlint:disable:next nslocalizedstring_key
         NSLocalizedString(self.resourceId, bundle: self.bundle, comment: "")

shared/build.gradle.kts

@@ -46,6 +46,7 @@ kotlin {
                 // Delete options passed to a system linker after upgrading to the Kotlin 1.9.10
                 // https://youtrack.jetbrains.com/issue/KT-60230
                 linkerOpts += "-ld64"
+                export(libs.mokoResources.main)
             }
         }
     }
@@ -100,39 +101,42 @@ kotlin {
             }
         }
 
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
         val iosMain by creating {
             dependsOn(commonMain)
-
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-
             dependencies {
                 implementation(libs.ktor.ios)
             }
         }
-        val iosX64Test by getting
-        val iosArm64Test by getting
-        val iosSimulatorArm64Test by getting
+        val iosX64Main by getting {
+            dependsOn(iosMain)
+        }
+        val iosArm64Main by getting {
+            dependsOn(iosMain)
+        }
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
+
         val iosTest by creating {
             dependsOn(commonTest)
-
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
+        }
+        val iosX64Test by getting {
+            dependsOn(iosTest)
+        }
+        val iosArm64Test by getting {
+            dependsOn(iosTest)
+        }
+        val iosSimulatorArm64Test by getting {
+            dependsOn(iosTest)
         }
     }
 }
 
 android {
-    compileSdkVersion(appVersions.versions.compileSdk.get().toInt())
+    compileSdk = appVersions.versions.compileSdk.get().toInt()
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdkVersion(appVersions.versions.minSdk.get().toInt())
-        targetSdkVersion(appVersions.versions.targetSdk.get().toInt())
+        minSdk = appVersions.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -143,6 +147,12 @@ android {
             excludes += "META-INF/AL2.0"
         }
     }
+    namespace = "org.hyperskill.app"
+
+    sourceSets {
+        getByName("main").java.srcDirs("build/generated/moko/androidMain/src")
+    }
+
 }
 
 buildkonfig {

shared/src/androidMain/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.hyperskill.app" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>