Skip to content

Commit

Permalink
Downgraded AGP to 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
schachi5000 committed Jun 5, 2024
1 parent a2340de commit 21c40fd
Show file tree
Hide file tree
Showing 10 changed files with 176 additions and 10 deletions.
8 changes: 1 addition & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"

#Kotlin
kotlin.code.style=official
kotlin.experimental.tryK2=true

#MPP
kotlin.mpp.stability.nowarn=true
Expand All @@ -15,9 +14,4 @@ kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
org.jetbrains.compose.experimental.uikit.enabled=true

#Android
android.useAndroidX=true

#Versions
kotlin.version=1.9.22
agp.version=8.4.0
compose.version=1.6.11
android.useAndroidX=true
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
# @keep
androidCompileSdk = "34"
androidGradlePlugin = "8.4.1"
androidGradlePlugin = "8.2.0"
# @keep
androidMinSdk = "24"
# @keep
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 129 additions & 0 deletions iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.3">
<BuildAction>
<BuildActionEntries>
<BuildActionEntry
buildForRunning = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7555FF7A242A565900829871"
BuildableName = "MCC.app"
BlueprintName = "iosApp"
ReferencedContainer = "container:iosApp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<LaunchAction
useCustomWorkingDirectory = "YES"
customWorkingDirectory = "/Users/alexander/Developer/git/marvel-champions-companion"
buildConfiguration = "Debug"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7555FF7A242A565900829871"
BuildableName = "MCC.app"
BlueprintName = "iosApp"
ReferencedContainer = "container:iosApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>iosApp.xcscheme_^#shared#^_</key>
<key>iosApp.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
Expand Down
6 changes: 5 additions & 1 deletion shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {

kotlin {

android()
androidTarget()

listOf(
iosX64(),
Expand Down Expand Up @@ -124,6 +124,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)
}
}

sqldelight {
Expand Down

0 comments on commit 21c40fd

Please sign in to comment.