Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ALTAPPS-1082, ALTAPPS-1083: Update Gradle & AGP #801

Merged
merged 13 commits into from
Dec 21, 2023
Merged
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion androidHyperskillApp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion androidHyperskillApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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" />
Original file line number Diff line number Diff line change
@@ -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())
XanderZhu marked this conversation as resolved.
Show resolved Hide resolved
injectComponents()
notificationPermissionDelegate = NotificationPermissionDelegate(this, ::onNotificationPermissionResult)
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
XanderZhu marked this conversation as resolved.
Show resolved Hide resolved
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
16 changes: 8 additions & 8 deletions iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -153,9 +153,8 @@
2C41127828376F6D004948A3 /* StepQuizDiscussionsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C41127728376F6D004948A3 /* StepQuizDiscussionsButton.swift */; };
2C42EFA827F2C03D00B4648B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2C42EFAA27F2C03D00B4648B /* Localizable.strings */; };
2C42EFAD27F2C29500B4648B /* Strings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C42EFAC27F2C29500B4648B /* Strings.swift */; };
2C42EFB327F2EA7B00B4648B /* ResourcesStringResource+Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C42EFB227F2EA7B00B4648B /* ResourcesStringResource+Localized.swift */; };
2C42EFB327F2EA7B00B4648B /* StringResource+Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C42EFB227F2EA7B00B4648B /* StringResource+Localized.swift */; };
2C42EFB527F2EAB300B4648B /* GraphicsColor+UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C42EFB427F2EAB300B4648B /* GraphicsColor+UIColor.swift */; };
2C42EFB727F2EAF800B4648B /* ResourcesColorResourceThemed+UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C42EFB627F2EAF800B4648B /* ResourcesColorResourceThemed+UIColor.swift */; };
2C43CDF928B55CC600E74762 /* HyperskillLogoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C43CDF828B55CC600E74762 /* HyperskillLogoView.swift */; };
2C43CDFB28B56AE600E74762 /* AuthPreviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C43CDFA28B56AE600E74762 /* AuthPreviews.swift */; };
2C45E7BD2A0FD9D600DFF32D /* ProjectSelectionListGridCellProjectLevelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C45E7BC2A0FD9D600DFF32D /* ProjectSelectionListGridCellProjectLevelView.swift */; };
@@ -446,6 +445,7 @@
2CE31F4D27F1E0C8008EEE66 /* AppAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE31F4C27F1E0C8008EEE66 /* AppAssembly.swift */; };
2CE58C5A2B07662300E5EBBE /* ChallengeWidgetContentStateProgressGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE58C592B07662300E5EBBE /* ChallengeWidgetContentStateProgressGridView.swift */; };
2CE58C5C2B0768F300E5EBBE /* ChallengeWidgetContentStateProgressGridItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE58C5B2B0768F300E5EBBE /* ChallengeWidgetContentStateProgressGridItemView.swift */; };
2CE601362B3345DD00E9CC46 /* ColorResource+UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE601352B3345DD00E9CC46 /* ColorResource+UIColor.swift */; };
2CE7B4842AB0593F00DCBE4D /* AttributedTextLabelWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE7B4832AB0593F00DCBE4D /* AttributedTextLabelWrapper.swift */; };
2CE7B4872AB05D0400DCBE4D /* StepQuizParsonsViewDataMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE7B4862AB05D0400DCBE4D /* StepQuizParsonsViewDataMapper.swift */; };
2CE7B48A2AB0973D00DCBE4D /* HTMLString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE7B4892AB0973D00DCBE4D /* HTMLString.swift */; };
@@ -821,9 +821,8 @@
2C41127728376F6D004948A3 /* StepQuizDiscussionsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizDiscussionsButton.swift; sourceTree = "<group>"; };
2C42EFA927F2C03D00B4648B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
2C42EFAC27F2C29500B4648B /* Strings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Strings.swift; sourceTree = "<group>"; };
2C42EFB227F2EA7B00B4648B /* ResourcesStringResource+Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ResourcesStringResource+Localized.swift"; sourceTree = "<group>"; };
2C42EFB227F2EA7B00B4648B /* StringResource+Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StringResource+Localized.swift"; sourceTree = "<group>"; };
2C42EFB427F2EAB300B4648B /* GraphicsColor+UIColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GraphicsColor+UIColor.swift"; sourceTree = "<group>"; };
2C42EFB627F2EAF800B4648B /* ResourcesColorResourceThemed+UIColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ResourcesColorResourceThemed+UIColor.swift"; sourceTree = "<group>"; };
2C43CDF828B55CC600E74762 /* HyperskillLogoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyperskillLogoView.swift; sourceTree = "<group>"; };
2C43CDFA28B56AE600E74762 /* AuthPreviews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthPreviews.swift; sourceTree = "<group>"; };
2C45E7BC2A0FD9D600DFF32D /* ProjectSelectionListGridCellProjectLevelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectSelectionListGridCellProjectLevelView.swift; sourceTree = "<group>"; };
@@ -1118,6 +1117,7 @@
2CE31F4C27F1E0C8008EEE66 /* AppAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAssembly.swift; sourceTree = "<group>"; };
2CE58C592B07662300E5EBBE /* ChallengeWidgetContentStateProgressGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChallengeWidgetContentStateProgressGridView.swift; sourceTree = "<group>"; };
2CE58C5B2B0768F300E5EBBE /* ChallengeWidgetContentStateProgressGridItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChallengeWidgetContentStateProgressGridItemView.swift; sourceTree = "<group>"; };
2CE601352B3345DD00E9CC46 /* ColorResource+UIColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ColorResource+UIColor.swift"; sourceTree = "<group>"; };
2CE7B4832AB0593F00DCBE4D /* AttributedTextLabelWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedTextLabelWrapper.swift; sourceTree = "<group>"; };
2CE7B4862AB05D0400DCBE4D /* StepQuizParsonsViewDataMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizParsonsViewDataMapper.swift; sourceTree = "<group>"; };
2CE7B4892AB0973D00DCBE4D /* HTMLString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTMLString.swift; sourceTree = "<group>"; };
@@ -2067,9 +2067,9 @@
2C42EFB127F2EA5000B4648B /* MokoResources */ = {
isa = PBXGroup;
children = (
2CE601352B3345DD00E9CC46 /* ColorResource+UIColor.swift */,
2C42EFB427F2EAB300B4648B /* GraphicsColor+UIColor.swift */,
2C42EFB627F2EAF800B4648B /* ResourcesColorResourceThemed+UIColor.swift */,
2C42EFB227F2EA7B00B4648B /* ResourcesStringResource+Localized.swift */,
2C42EFB227F2EA7B00B4648B /* StringResource+Localized.swift */,
);
path = MokoResources;
sourceTree = "<group>";
@@ -4366,7 +4366,7 @@
E9A3435029113FA400E0C0A4 /* StepQuizHintReactionButtonView.swift in Sources */,
2C05AC512A0EACF50039C7EF /* ProjectSelectionListSkeletonView.swift in Sources */,
2CAE8CF0280525BE00E6C83D /* StepViewModel.swift in Sources */,
2C42EFB327F2EA7B00B4648B /* ResourcesStringResource+Localized.swift in Sources */,
2C42EFB327F2EA7B00B4648B /* StringResource+Localized.swift in Sources */,
2C2FD622281920B1004E7AF6 /* SentryInfo.swift in Sources */,
2C0DB91C28645ADA001EA35E /* CodeCompletionKeywords.swift in Sources */,
2CA8E093281039EB00154088 /* OutlineButtonStyle.swift in Sources */,
@@ -4386,6 +4386,7 @@
2CBFB94A28897DBB0044D1BA /* StepQuizCodeFullScreenView.swift in Sources */,
2C0DB90A2864515B001EA35E /* CodeEditorViewDelegate.swift in Sources */,
2C336D132865C47900C91342 /* ApplicationTheme.swift in Sources */,
2CE601362B3345DD00E9CC46 /* ColorResource+UIColor.swift in Sources */,
E9AB310F29DECC7500645376 /* StudyPlanSectionHeaderStatisticsView.swift in Sources */,
2C7CB66D2ADFB951006F78DA /* StepQuizFillBlanksViewModel.swift in Sources */,
E99B21812887E535006A6154 /* StepQuizSkeletonViewFactory.swift in Sources */,
@@ -4824,7 +4825,6 @@
2C25BFD52851F8F00036C689 /* UIColor+DesignSystem.swift in Sources */,
2C023C8D285DCA4300D2D5A9 /* DatasetExtensions.swift in Sources */,
E91017152832975C002E70F5 /* CheckboxButton.swift in Sources */,
2C42EFB727F2EAF800B4648B /* ResourcesColorResourceThemed+UIColor.swift in Sources */,
2C99B1002A14255F0018627B /* StudyPlanWidgetViewStateSectionItemStateWrapper.swift in Sources */,
E9E964872A0B8D8200841DF6 /* StepQuizProblemsLimitView.swift in Sources */,
2C8CD9AE2994EFC5008DC09D /* DebugFeatureViewStateKsExtensions.swift in Sources */,
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import shared
import UIKit

extension shared.ColorResource {
var uiColor: UIColor {
switch self.asColorDesc() {
case let descResource as ColorDescResource:
descResource.resource.getUIColor() // Color from the named asset
case let singleColor as ColorDescSingle:
singleColor.color.uiColor
case let themedColor as ColorDescThemed:
UIColor.dynamic(
light: themedColor.lightColor.uiColor,
dark: themedColor.darkColor.uiColor
)
default:
fatalError("Unknown color description for name = \(self.name)")
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import shared

extension ResourcesStringResource {
extension shared.StringResource {
func localized() -> String {
// swiftlint:disable:next nslocalizedstring_key
NSLocalizedString(self.resourceId, bundle: self.bundle, comment: "")
Loading
Oops, something went wrong.