Skip to content

Update dependencies, use new Google Meerkat KMP Shared Module functionality #37

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

Merged
merged 24 commits into from
Mar 13, 2025
Merged

Update dependencies, use new Google Meerkat KMP Shared Module functionality #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e075c35
Merge pull request #25 from Kotlin/v2_update_main
pahill Jul 1, 2024
9d34ff0
Update Gradle to 8.10
adam-enko Sep 2, 2024
44ccea1
rename 'agp' to 'android-gradlePlugin'
adam-enko Sep 2, 2024
ad75b04
tidy gitignore
adam-enko Sep 2, 2024
16091fb
tidy settings.gradle.kts
adam-enko Sep 2, 2024
f6209a2
make IJ use JDK 17
adam-enko Sep 2, 2024
0e80143
tidy build.gradle.kts
adam-enko Sep 2, 2024
fbd0176
tidy README.md
adam-enko Sep 2, 2024
9dedf74
bump Kotlin to 2.0.20
adam-enko Sep 2, 2024
34120b3
replace `kotlinOptions {}` with `kotlin.compilerOptions {}`
adam-enko Sep 2, 2024
0cc681b
remove plugins from root `build.gradle.kts` - the versions are instea…
adam-enko Sep 2, 2024
99bbadb
Merge pull request #28 from Kotlin/adam/KT-71125-update-build-config
adam-enko Sep 3, 2024
1aaed07
Use version catalog to apply plugins in `:app`
adam-enko Sep 3, 2024
7bcbcba
Merge pull request #29 from Kotlin/adam/fix/use-version-catalog-for-p…
adam-enko Sep 3, 2024
ac91ae4
Add back plugins in the root project
antohaby Sep 3, 2024
6df9537
Downgrade gradle to 8.9 as Kotlin Multiplatform 2.0.20 doesn't suppor…
antohaby Sep 3, 2024
707ac47
update Gradle wrapper jar
adam-enko Sep 4, 2024
2c8f336
Add plugins back to the root project and adjust the Gradle version
zamulla Sep 5, 2024
cfe1749
Create GitHub Action to check `gradle build` works
adam-enko Sep 5, 2024
173e121
Merge pull request #32 from Kotlin/adam/add-gradle-build-gha
adam-enko Sep 5, 2024
1018971
Add Kotlin Multiplatform module and update project configs
pahill Mar 4, 2025
c55d6db
Switch Android codebase to use shared module dependencies
pahill Mar 4, 2025
6bdb5a3
Switch Android codebase to use shared module dependencies
pahill Mar 4, 2025
eca8186
Merge conflict resolutions etc.
pahill Mar 4, 2025
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
Prev Previous commit
Merge conflict resolutions etc.
  • Loading branch information
@pahill
pahill committed Mar 4, 2025
commit eca8186108fa0d0e01e67a8ededd3276dade5b6e
2 changes: 1 addition & 1 deletion .idea/compiler.xml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11

plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.androidApplication)
}

kotlin {
Expand Down
371 changes: 371 additions & 0 deletions iosApp/simpleloginIOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,371 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objects = {

/* Begin PBXBuildFile section */
661BBD8C2C2D61E600991D95 /* simpleloginIOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 661BBD8B2C2D61E600991D95 /* simpleloginIOSApp.swift */; };
661BBD8E2C2D61E600991D95 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 661BBD8D2C2D61E600991D95 /* ContentView.swift */; };
661BBD902C2D61E700991D95 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 661BBD8F2C2D61E700991D95 /* Assets.xcassets */; };
661BBD932C2D61E700991D95 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 661BBD922C2D61E700991D95 /* Preview Assets.xcassets */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
661BBD882C2D61E600991D95 /* simpleloginIOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleloginIOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
661BBD8B2C2D61E600991D95 /* simpleloginIOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = simpleloginIOSApp.swift; sourceTree = "<group>"; };
661BBD8D2C2D61E600991D95 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
661BBD8F2C2D61E700991D95 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
661BBD922C2D61E700991D95 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
661BBD852C2D61E600991D95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
661BBD7F2C2D61E600991D95 = {
isa = PBXGroup;
children = (
661BBD8A2C2D61E600991D95 /* simpleloginIOS */,
661BBD892C2D61E600991D95 /* Products */,
);
sourceTree = "<group>";
};
661BBD892C2D61E600991D95 /* Products */ = {
isa = PBXGroup;
children = (
661BBD882C2D61E600991D95 /* simpleloginIOS.app */,
);
name = Products;
sourceTree = "<group>";
};
661BBD8A2C2D61E600991D95 /* simpleloginIOS */ = {
isa = PBXGroup;
children = (
661BBD8B2C2D61E600991D95 /* simpleloginIOSApp.swift */,
661BBD8D2C2D61E600991D95 /* ContentView.swift */,
661BBD8F2C2D61E700991D95 /* Assets.xcassets */,
661BBD912C2D61E700991D95 /* Preview Content */,
);
path = simpleloginIOS;
sourceTree = "<group>";
};
661BBD912C2D61E700991D95 /* Preview Content */ = {
isa = PBXGroup;
children = (
661BBD922C2D61E700991D95 /* Preview Assets.xcassets */,
);
path = "Preview Content";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
661BBD872C2D61E600991D95 /* simpleloginIOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 661BBD962C2D61E700991D95 /* Build configuration list for PBXNativeTarget "simpleloginIOS" */;
buildPhases = (
661BBD992C2D623900991D95 /* Run Script */,
661BBD842C2D61E600991D95 /* Sources */,
661BBD852C2D61E600991D95 /* Frameworks */,
661BBD862C2D61E600991D95 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = simpleloginIOS;
productName = simpleloginIOS;
productReference = 661BBD882C2D61E600991D95 /* simpleloginIOS.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
661BBD802C2D61E600991D95 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1540;
LastUpgradeCheck = 1540;
TargetAttributes = {
661BBD872C2D61E600991D95 = {
CreatedOnToolsVersion = 15.4;
};
};
};
buildConfigurationList = 661BBD832C2D61E600991D95 /* Build configuration list for PBXProject "simpleloginIOS" */;
compatibilityVersion = "Xcode 14.0";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 661BBD7F2C2D61E600991D95;
productRefGroup = 661BBD892C2D61E600991D95 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
661BBD872C2D61E600991D95 /* simpleloginIOS */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
661BBD862C2D61E600991D95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
661BBD932C2D61E700991D95 /* Preview Assets.xcassets in Resources */,
661BBD902C2D61E700991D95 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
661BBD992C2D623900991D95 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Run Script";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
661BBD842C2D61E600991D95 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
661BBD8E2C2D61E600991D95 /* ContentView.swift in Sources */,
661BBD8C2C2D61E600991D95 /* simpleloginIOSApp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
661BBD942C2D61E700991D95 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.5;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
661BBD952C2D61E700991D95 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.5;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
VALIDATE_PRODUCT = YES;
};
name = Release;
};
661BBD972C2D61E700991D95 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"simpleloginIOS/Preview Content\"";
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleloginIOS;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
661BBD982C2D61E700991D95 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"simpleloginIOS/Preview Content\"";
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.jetbrains.simpleloginIOS;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
661BBD832C2D61E600991D95 /* Build configuration list for PBXProject "simpleloginIOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
661BBD942C2D61E700991D95 /* Debug */,
661BBD952C2D61E700991D95 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
661BBD962C2D61E700991D95 /* Build configuration list for PBXNativeTarget "simpleloginIOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
661BBD972C2D61E700991D95 /* Debug */,
661BBD982C2D61E700991D95 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 661BBD802C2D61E600991D95 /* Project object */;
}
7 changes: 7 additions & 0 deletions iosApp/simpleloginIOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

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

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.