Skip to content

Commit 24524e2

Browse files
michallaskowskimichallaskowski
committed
Rename to mokttp
1 parent fd4c686 commit 24524e2

File tree

15 files changed

+26
-28
lines changed

15 files changed

+26
-28
lines changed

‎.idea/gradle.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sharedCode/build.gradle‎ renamed to ‎library/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ kotlin {
3333
ios('ios') {
3434
binaries {
3535
framework {
36-
baseName = "mockttp"
36+
baseName = "mokttp"
3737
embedBitcode("disable")
3838
linkerOpts("-F$projectDir/../Carthage/Build/iOS")
3939
}

‎sharedCode/gcdWebServer.def‎ renamed to ‎library/gcdWebServer.def‎

File renamed without changes.

‎sharedCode/src/androidMain/AndroidManifest.xml‎ renamed to ‎library/src/androidMain/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="dev.michallaskowski.mockttp.android">
2+
<manifest package="dev.michallaskowski.mokttp.android">
33
<application/>
44
</manifest>

‎sharedCode/src/androidMain/kotlin/actual.kt‎ renamed to ‎library/src/androidMain/kotlin/actual.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.michallaskowski.mockttp
1+
package dev.michallaskowski.mokttp
22

33
import okhttp3.Headers.Companion.toHeaders
44
import okhttp3.mockwebserver.Dispatcher

‎sharedCode/src/commonMain/kotlin/HttpServer.kt‎ renamed to ‎library/src/commonMain/kotlin/HttpServer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.michallaskowski.mockttp
1+
package dev.michallaskowski.mokttp
22

33
expect class Data
44
expect fun Data(fromString: String): Data

‎sharedCode/src/iOSMain/kotlin/actual.kt‎ renamed to ‎library/src/iOSMain/kotlin/actual.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.michallaskowski.mockttp
1+
package dev.michallaskowski.mokttp
22

33
import gcdWebServer.*
44
import platform.Foundation.*

‎sample-android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
compileSdkVersion 29
99

1010
defaultConfig {
11-
applicationId 'dev.michallaskowski.mockttp.sample.android'
11+
applicationId 'dev.michallaskowski.mokttp.sample.android'
1212
minSdkVersion 24
1313
targetSdkVersion 29
1414
versionCode 1
@@ -49,7 +49,7 @@ dependencies {
4949
implementation 'androidx.recyclerview:recyclerview:1.1.0'
5050
implementation 'androidx.recyclerview:recyclerview-selection:1.0.0'
5151

52-
implementation project(':mockttp-core')
52+
implementation project(':mokttp')
5353
implementation project(':sample-sharedCode')
5454

5555
testImplementation 'junit:junit:4.13'

‎sample-android/src/main/kotlin/MainActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import androidx.appcompat.app.AppCompatActivity
66
import android.view.Menu
77
import android.view.MenuItem
88
import androidx.lifecycle.lifecycleScope
9-
import dev.michallaskowski.mockttp.*
10-
import dev.michallaskowski.mockttp.sample.shared.MockServer
9+
import dev.michallaskowski.mokttp.*
10+
import dev.michallaskowski.mokttp.sample.shared.MockServer
1111

1212
import kotlinx.android.synthetic.main.activity_main.*
1313
import kotlinx.android.synthetic.main.content_main.*

‎sample-ios/SampleiOS.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
C141B62F23EF0AAE003AAE22 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C141B62E23EF0AAE003AAE22 /* Assets.xcassets */; };
1414
C141B63223EF0AAE003AAE22 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C141B63123EF0AAE003AAE22 /* Preview Assets.xcassets */; };
1515
C141B63523EF0AAE003AAE22 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C141B63323EF0AAE003AAE22 /* LaunchScreen.storyboard */; };
16-
C17070A4241708AB00A35D8A /* mockttp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C17070A3241708AB00A35D8A /* mockttp.framework */; };
17-
C17070A6241709CA00A35D8A /* mockttp.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C17070A3241708AB00A35D8A /* mockttp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1816
C17070A8241709EC00A35D8A /* GCDWebServers.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C17070A7241709EC00A35D8A /* GCDWebServers.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1917
C17070AA2422D74300A35D8A /* ContributorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17070A92422D74300A35D8A /* ContributorsView.swift */; };
2018
C17E09C524AF756700BB0A33 /* sharedMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C17E09C424AF756700BB0A33 /* sharedMock.framework */; };
2119
C17E09C624AF756700BB0A33 /* sharedMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C17E09C424AF756700BB0A33 /* sharedMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
20+
C1C6B0D724AFABEB0062B742 /* mokttp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C6B0D624AFABEB0062B742 /* mokttp.framework */; };
21+
C1C6B0D824AFABEB0062B742 /* mokttp.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C1C6B0D624AFABEB0062B742 /* mokttp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2222
/* End PBXBuildFile section */
2323

2424
/* Begin PBXCopyFilesBuildPhase section */
@@ -28,9 +28,9 @@
2828
dstPath = "";
2929
dstSubfolderSpec = 10;
3030
files = (
31+
C1C6B0D824AFABEB0062B742 /* mokttp.framework in CopyFiles */,
3132
C17E09C624AF756700BB0A33 /* sharedMock.framework in CopyFiles */,
3233
C17070A8241709EC00A35D8A /* GCDWebServers.framework in CopyFiles */,
33-
C17070A6241709CA00A35D8A /* mockttp.framework in CopyFiles */,
3434
);
3535
runOnlyForDeploymentPostprocessing = 0;
3636
};
@@ -45,20 +45,19 @@
4545
C141B63123EF0AAE003AAE22 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
4646
C141B63423EF0AAE003AAE22 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4747
C141B63623EF0AAE003AAE22 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48-
C157091B23EF6050003481FB /* sharedTests.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sharedTests.framework; path = "../sample-sharedTests/build/bin/iOSSimulator/debugFramework/sharedTests.framework"; sourceTree = "<group>"; };
49-
C17070A3241708AB00A35D8A /* mockttp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mockttp.framework; path = ../sharedCode/build/bin/iosX64/debugFramework/mockttp.framework; sourceTree = "<group>"; };
5048
C17070A7241709EC00A35D8A /* GCDWebServers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDWebServers.framework; path = ../Carthage/Build/iOS/GCDWebServers.framework; sourceTree = "<group>"; };
5149
C17070A92422D74300A35D8A /* ContributorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContributorsView.swift; sourceTree = "<group>"; };
5250
C17E09C424AF756700BB0A33 /* sharedMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sharedMock.framework; path = "../sample-sharedCode/build/bin/iosX64/debugFramework/sharedMock.framework"; sourceTree = "<group>"; };
51+
C1C6B0D624AFABEB0062B742 /* mokttp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mokttp.framework; path = ../library/build/bin/iosX64/debugFramework/mokttp.framework; sourceTree = "<group>"; };
5352
/* End PBXFileReference section */
5453

5554
/* Begin PBXFrameworksBuildPhase section */
5655
C141B62223EF0AAB003AAE22 /* Frameworks */ = {
5756
isa = PBXFrameworksBuildPhase;
5857
buildActionMask = 2147483647;
5958
files = (
60-
C17070A4241708AB00A35D8A /* mockttp.framework in Frameworks */,
6159
C17E09C524AF756700BB0A33 /* sharedMock.framework in Frameworks */,
60+
C1C6B0D724AFABEB0062B742 /* mokttp.framework in Frameworks */,
6261
);
6362
runOnlyForDeploymentPostprocessing = 0;
6463
};
@@ -108,10 +107,9 @@
108107
C157091A23EF604F003481FB /* Frameworks */ = {
109108
isa = PBXGroup;
110109
children = (
110+
C1C6B0D624AFABEB0062B742 /* mokttp.framework */,
111111
C17070A7241709EC00A35D8A /* GCDWebServers.framework */,
112112
C17E09C424AF756700BB0A33 /* sharedMock.framework */,
113-
C17070A3241708AB00A35D8A /* mockttp.framework */,
114-
C157091B23EF6050003481FB /* sharedTests.framework */,
115113
);
116114
name = Frameworks;
117115
sourceTree = "<group>";
@@ -201,7 +199,7 @@
201199
);
202200
runOnlyForDeploymentPostprocessing = 0;
203201
shellPath = /bin/bash;
204-
shellScript = "cd \"$PROJECT_DIR/..\"\n./gradlew mockttp-core:linkDebugFrameworkIosX64 sample-sharedCode:linkDebugFrameworkIosX64\n";
202+
shellScript = "cd \"$PROJECT_DIR/..\"\n./gradlew mokttp:linkDebugFrameworkIosX64 sample-sharedCode:linkDebugFrameworkIosX64\n";
205203
};
206204
/* End PBXShellScriptBuildPhase section */
207205

@@ -354,7 +352,7 @@
354352
DEVELOPMENT_TEAM = A3ZT87L5Y5;
355353
ENABLE_PREVIEWS = YES;
356354
FRAMEWORK_SEARCH_PATHS = (
357-
"$(PROJECT_DIR)/../sharedCode/build/bin/iOSX64/debugFramework",
355+
"$(PROJECT_DIR)/../library/build/bin/iOSX64/debugFramework",
358356
"$(PROJECT_DIR)/../sample-sharedCode/build/bin/iOSX64/debugFramework",
359357
);
360358
INFOPLIST_FILE = SampleiOS/Info.plist;
@@ -378,7 +376,7 @@
378376
DEVELOPMENT_TEAM = A3ZT87L5Y5;
379377
ENABLE_PREVIEWS = YES;
380378
FRAMEWORK_SEARCH_PATHS = (
381-
"$(PROJECT_DIR)/../sharedCode/build/bin/iOSX64/debugFramework",
379+
"$(PROJECT_DIR)/../library/build/bin/iOSX64/debugFramework",
382380
"$(PROJECT_DIR)/../sample-sharedCode/build/bin/iOSX64/debugFramework",
383381
);
384382
INFOPLIST_FILE = SampleiOS/Info.plist;

0 commit comments

Comments
 (0)