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

Replace cocoapods #119

Merged
merged 19 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.externalNativeBuild
.cxx
local.properties
.kotlin

#Cocopods
appiOS/Pods/
Expand Down
14 changes: 1 addition & 13 deletions appAndroid/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
alias(libs.plugins.firebase.appDistribution.plugin)
alias(libs.plugins.firebase.crashlytics.plugin)
alias(libs.plugins.firebase.performance.plugin)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down Expand Up @@ -52,9 +53,6 @@ android {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.7"
}
namespace = "com.vickbt.notflix"
}

Expand All @@ -78,14 +76,4 @@ dependencies {
implementation(libs.firebase.analytics)
implementation(libs.firebase.crashlytics)
implementation(libs.firebase.performance)

testImplementation(libs.jUnitKtx)
testImplementation(libs.kotlinX.coroutines.test)
testImplementation(libs.mockk)
testImplementation(libs.kotlin.test)
testImplementation(libs.archTestCore)
testImplementation(libs.robolectric)

androidTestImplementation(libs.test.rules)
androidTestImplementation(libs.test.runner)
}
1 change: 1 addition & 0 deletions appDesktop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.jvm)
alias(libs.plugins.compose)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
65 changes: 3 additions & 62 deletions appiOS/Notflix.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
1CE0FB1D2A6A8B5100B26932 /* NotflixTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CE0FB1C2A6A8B5100B26932 /* NotflixTests.swift */; };
1CE0FB272A6A8B5100B26932 /* NotflixUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CE0FB262A6A8B5100B26932 /* NotflixUITests.swift */; };
1CE0FB292A6A8B5100B26932 /* NotflixUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CE0FB282A6A8B5100B26932 /* NotflixUITestsLaunchTests.swift */; };
EEF0A9DB7EF0B7314CD86782 /* Pods_Notflix.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B1DDC9A5FE4F3F3C8914D53 /* Pods_Notflix.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -49,17 +48,13 @@
1CE0FB222A6A8B5100B26932 /* NotflixUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NotflixUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
1CE0FB262A6A8B5100B26932 /* NotflixUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotflixUITests.swift; sourceTree = "<group>"; };
1CE0FB282A6A8B5100B26932 /* NotflixUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotflixUITestsLaunchTests.swift; sourceTree = "<group>"; };
5B1DDC9A5FE4F3F3C8914D53 /* Pods_Notflix.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Notflix.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BBBC4C8A43B1D42D922F9C90 /* Pods-Notflix.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Notflix.release.xcconfig"; path = "Target Support Files/Pods-Notflix/Pods-Notflix.release.xcconfig"; sourceTree = "<group>"; };
F43A1A4F78675B8E4189135B /* Pods-Notflix.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Notflix.debug.xcconfig"; path = "Target Support Files/Pods-Notflix/Pods-Notflix.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
1CE0FB052A6A8B4F00B26932 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
EEF0A9DB7EF0B7314CD86782 /* Pods_Notflix.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -88,7 +83,6 @@
1CE0FB252A6A8B5100B26932 /* NotflixUITests */,
1CE0FB092A6A8B4F00B26932 /* Products */,
380B2E20DFD34D0F45BCF04A /* Pods */,
A9050EA9DF34E91E4EB54887 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -143,33 +137,21 @@
380B2E20DFD34D0F45BCF04A /* Pods */ = {
isa = PBXGroup;
children = (
F43A1A4F78675B8E4189135B /* Pods-Notflix.debug.xcconfig */,
BBBC4C8A43B1D42D922F9C90 /* Pods-Notflix.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
};
A9050EA9DF34E91E4EB54887 /* Frameworks */ = {
isa = PBXGroup;
children = (
5B1DDC9A5FE4F3F3C8914D53 /* Pods_Notflix.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
1CE0FB072A6A8B4F00B26932 /* Notflix */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1CE0FB2C2A6A8B5100B26932 /* Build configuration list for PBXNativeTarget "Notflix" */;
buildPhases = (
993BC5CD8E6407198A6CC6F3 /* [CP] Check Pods Manifest.lock */,
1C13F5F92C773DB900B1DA2E /* ShellScript */,
1CE0FB042A6A8B4F00B26932 /* Sources */,
1CE0FB052A6A8B4F00B26932 /* Frameworks */,
1CE0FB062A6A8B4F00B26932 /* Resources */,
3D4331466293CD88FAB5966F /* [CP] Copy Pods Resources */,
987E1C4A95024182A3B0F904 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -286,61 +268,22 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
3D4331466293CD88FAB5966F /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Notflix/Pods-Notflix-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Notflix/Pods-Notflix-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Notflix/Pods-Notflix-resources.sh\"\n";
showEnvVarsInLog = 0;
};
987E1C4A95024182A3B0F904 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Notflix/Pods-Notflix-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Notflix/Pods-Notflix-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Notflix/Pods-Notflix-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
993BC5CD8E6407198A6CC6F3 /* [CP] Check Pods Manifest.lock */ = {
1C13F5F92C773DB900B1DA2E /* 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-Notflix-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 = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -505,7 +448,6 @@
};
1CE0FB2D2A6A8B5100B26932 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F43A1A4F78675B8E4189135B /* Pods-Notflix.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -534,7 +476,6 @@
};
1CE0FB2E2A6A8B5100B26932 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BBBC4C8A43B1D42D922F9C90 /* Pods-Notflix.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>Notflix.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
Expand Down
14 changes: 0 additions & 14 deletions appiOS/Podfile

This file was deleted.

9 changes: 1 addition & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ plugins {
alias(libs.plugins.android.kotlin) apply false
alias(libs.plugins.multiplatform) apply false
alias(libs.plugins.jvm) apply false
alias(libs.plugins.nativeCocoapod) apply false

alias(libs.plugins.googleServices.plugin) apply false

alias(libs.plugins.compose) apply false
alias(libs.plugins.compose.compiler) apply false

alias(libs.plugins.firebase.appDistribution.plugin) apply false
alias(libs.plugins.firebase.crashlytics.plugin) apply false
alias(libs.plugins.firebase.performance.plugin) apply false

alias(libs.plugins.ktLint)
alias(libs.plugins.detekt)
alias(libs.plugins.gradleVersionUpdates)
}

allprojects {
Expand Down Expand Up @@ -47,12 +46,6 @@ subprojects {
parallel = true
config = files("${project.rootDir}/config/detekt/detekt.yml")
}

tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
checkForGradleUpdate = true
outputDir = "build/dependencyUpdates"
reportfileName = "report"
}
}

tasks.register("clean").configure {
Expand Down
Loading
Loading