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.

Sign up for GitHub

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

Kpg/kotlin2.0.0 direct linking ios #314

Merged
merged 11 commits into from
Jun 11, 2024
Merged

Kpg/kotlin2.0.0 direct linking ios #314

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18cd36d
Kotlin 2.0.0 and directly linking for iOS
kpgalligan May 28, 2024
ba62c03
Try static build
kpgalligan May 28, 2024
e567688
Update build.gradle.kts
kpgalligan May 28, 2024
ce6db20
Update to new Compose compiler.
TadeasKriz May 30, 2024
839169a
Update iOS GH action.
TadeasKriz May 30, 2024
a979055
Update xcodebuild-action in iOS GHA workflow.
TadeasKriz May 30, 2024
0a2b46f
Rollback xcodebuild-action version update.
TadeasKriz May 30, 2024
a775fd6
Run xcodebuild without xcpretty (hopefully prints more information).
TadeasKriz Jun 11, 2024
30004b5
Don't require code signing on CI.
TadeasKriz Jun 11, 2024
d542023
Remove development team from signing.
TadeasKriz Jun 11, 2024
64c392a
Fix empty code signing setting.
TadeasKriz Jun 11, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
*.xcbkptlist
!/.idea/codeStyles/*
!/.idea/inspectionProfiles/*
.kotlin
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.skie) apply false
alias(libs.plugins.cocoapods) apply false
}

subprojects {
Expand Down
17 changes: 8 additions & 9 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ targetSdk = "34"
compileSdk = "34"

# Dependencies
kotlin = "1.9.22"
kotlin = "2.0.0"

android-gradle-plugin = "8.2.2"
ktlint-gradle = "12.1.0"

compose = "1.5.4"
composeCompiler = "1.5.8"
compose = "1.6.7"
composeCompiler = "1.5.14"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be instead using new compose compiler plugin that ties with Kotlin version

https://developer.android.com/develop/ui/compose/compiler


android-desugaring = "2.0.4"
androidx-core = "1.12.0"
Expand All @@ -21,14 +21,14 @@ androidx-lifecycle = "2.7.0"

junit = "4.13.2"

coroutines = "1.7.3"
kotlinx-datetime = "0.5.0"
ktor = "2.3.7"
coroutines = "1.8.0"
kotlinx-datetime = "0.6.0"
ktor = "2.3.9"

robolectric = "4.10.3"

kermit = "2.0.2"
skie = "0.6.1"
kermit = "2.0.3"
skie = "0.8.0"

koin = "3.5.3"
multiplatformSettings = "1.1.1"
Expand Down Expand Up @@ -95,7 +95,6 @@ android-application = { id = "com.android.application", version.ref = "android-g
android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
skie = { id = "co.touchlab.skie", version.ref = "skie" }
cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }

[bundles]
app-ui = [
Expand Down
72 changes: 4 additions & 68 deletions ios/KaMPKitiOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
3DFF917C64A18A83DA010EE1 /* Pods_KaMPKitiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B859F3FB23133D22AB9DD835 /* Pods_KaMPKitiOS.framework */; };
46A5B5EF26AF54F7002EFEAA /* BreedListScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A5B5EE26AF54F7002EFEAA /* BreedListScreen.swift */; };
46A5B60826B04921002EFEAA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 46A5B60626B04920002EFEAA /* Main.storyboard */; };
46B5284D249C5CF400A7725D /* Koin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B5284C249C5CF400A7725D /* Koin.swift */; };
Expand Down Expand Up @@ -36,13 +35,9 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1DFCC00C8DAA719770A18D1A /* Pods-KaMPKitiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KaMPKitiOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig"; sourceTree = "<group>"; };
2A1ED6A4A2A53F5F75C58E5F /* Pods-KaMPKitiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KaMPKitiOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig"; sourceTree = "<group>"; };
46A5B5EE26AF54F7002EFEAA /* BreedListScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreedListScreen.swift; sourceTree = "<group>"; };
46A5B60726B04920002EFEAA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
46B5284C249C5CF400A7725D /* Koin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Koin.swift; sourceTree = "<group>"; };
B859F3FB23133D22AB9DD835 /* Pods_KaMPKitiOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_KaMPKitiOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
ED1F782AF3705197012D0C33 /* Pods-KaMPKitiOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KaMPKitiOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig"; sourceTree = "<group>"; };
F1465EFD23AA94BF0055F7C3 /* KaMPKitiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KaMPKitiOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
F1465F0023AA94BF0055F7C3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F1465F0923AA94BF0055F7C3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -54,15 +49,13 @@
F1465F1E23AA94C00055F7C3 /* KaMPKitiOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KaMPKitiOSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F1465F2223AA94C00055F7C3 /* KaMPKitiOSUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaMPKitiOSUITests.swift; sourceTree = "<group>"; };
F1465F2423AA94C00055F7C3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F9C259C83C689DF8F4602F38 /* Pods-KaMPKitiOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KaMPKitiOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
F1465EFA23AA94BF0055F7C3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3DFF917C64A18A83DA010EE1 /* Pods_KaMPKitiOS.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -86,30 +79,17 @@
6278498AD96A4D949D39BF44 /* Frameworks */ = {
isa = PBXGroup;
children = (
B859F3FB23133D22AB9DD835 /* Pods_KaMPKitiOS.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
DF9BBECBCD175B90105DA8D9 /* Pods */ = {
isa = PBXGroup;
children = (
F9C259C83C689DF8F4602F38 /* Pods-KaMPKitiOS.debug.xcconfig */,
1DFCC00C8DAA719770A18D1A /* Pods-KaMPKitiOS.release.xcconfig */,
ED1F782AF3705197012D0C33 /* Pods-KaMPKitiOS.debug.xcconfig */,
2A1ED6A4A2A53F5F75C58E5F /* Pods-KaMPKitiOS.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
F1465EF423AA94BF0055F7C3 = {
isa = PBXGroup;
children = (
F1465EFF23AA94BF0055F7C3 /* KaMPKitiOS */,
F1465F1623AA94C00055F7C3 /* KaMPKitiOSTests */,
F1465F2123AA94C00055F7C3 /* KaMPKitiOSUITests */,
F1465EFE23AA94BF0055F7C3 /* Products */,
DF9BBECBCD175B90105DA8D9 /* Pods */,
6278498AD96A4D949D39BF44 /* Frameworks */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -163,12 +143,10 @@
isa = PBXNativeTarget;
buildConfigurationList = F1465F2723AA94C00055F7C3 /* Build configuration list for PBXNativeTarget "KaMPKitiOS" */;
buildPhases = (
DE3B37D33D11C1968D62DBBA /* [CP] Check Pods Manifest.lock */,
9C16E6F82C0618F100154B87 /* ShellScript */,
F1465EF923AA94BF0055F7C3 /* Sources */,
451A87F626D69EA40013D7F8 /* SwiftLint */,
F1465EFA23AA94BF0055F7C3 /* Frameworks */,
F1465EFB23AA94BF0055F7C3 /* Resources */,
9927C3E3A82FD5756098EAC1 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -286,62 +264,22 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
451A87F626D69EA40013D7F8 /* SwiftLint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = SwiftLint;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# For reference: https://github.com/realm/SwiftLint\n\n${PODS_ROOT}/SwiftLint/swiftlint\n";
};
9927C3E3A82FD5756098EAC1 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
DE3B37D33D11C1968D62DBBA /* [CP] Check Pods Manifest.lock */ = {
9C16E6F82C0618F100154B87 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-KaMPKitiOS-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"$SRCROOT/..\"\n./gradlew embedAndSignAppleFrameworkForXcode\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -531,7 +469,6 @@
};
F1465F2823AA94C00055F7C3 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = ED1F782AF3705197012D0C33 /* Pods-KaMPKitiOS.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
Expand Down Expand Up @@ -560,7 +497,6 @@
};
F1465F2923AA94C00055F7C3 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2A1ED6A4A2A53F5F75C58E5F /* Pods-KaMPKitiOS.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
Expand Down
20 changes: 0 additions & 20 deletions ios/KaMPKitiOS.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ios/KaMPKitiOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions ios/Podfile
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ios/Podfile.lock
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ios/Pods/Local Podspecs/shared.podspec.json
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ios/Pods/Manifest.lock
View file
Open in desktop

This file was deleted.

Loading
Loading