Skip to content

Commit

Permalink
Merge pull request #89 from VictorKabata/develop
Browse files Browse the repository at this point in the history
Develop -> Main
  • Loading branch information
VictorKabata authored Jul 9, 2023
2 parents 530b95a + 420e224 commit 234e898
Show file tree
Hide file tree
Showing 137 changed files with 1,813 additions and 281 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: chmod +x ./gradlew

- name: Execute unit tests
run: ./gradlew allTests --stacktrace
run: ./gradlew test --stacktrace

- name: Generate test report
uses: actions/upload-artifact@v2
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
.externalNativeBuild
.cxx
local.properties

#Cocopods
app-iOS/Pods/
app-iOS/Podfile.lock
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ An android and desktop app built using [Kotlin Multiplatforom](https://kotlinlan
## Table Of Content

- [Prerequisite](##prerequisite)
- [Running](##running)
- [Pros of KMP/KMM](##pros-of-kmpkmm)
- [App Structure](##app-structure)
- [1. androidApp](###1-androidapp)
Expand Down Expand Up @@ -51,6 +52,20 @@ An android and desktop app built using [Kotlin Multiplatforom](https://kotlinlan

// ToDo

## Running

Set up the `local.properties` file in the project's root directory (if it doesn't already exist) by adding the following properties:

```properties
api_key=<YOUR TMDB API KEY>
```

Run with the following command:

```bash
./gradlew run
```

## Pros of KMP/KMM

- Faster development since you only need to write most of the business logic and tests only once.
Expand Down
31 changes: 0 additions & 31 deletions app-iOS/Pods/Local Podspecs/shared.podspec.json

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"pins" : [
{
"identity" : "shimmer",
"kind" : "remoteSourceControl",
"location" : "https://github.com/joshuajhomann/Shimmer",
"state" : {
"branch" : "master",
"revision" : "2fde687b3f1d9c5409c53da095d3686361e41343"
}
},
{
"identity" : "swiftui-cached-async-image",
"kind" : "remoteSourceControl",
"location" : "https://github.com/lorenzofiamingo/swiftui-cached-async-image",
"state" : {
"branch" : "main",
"revision" : "2abb11839f80ebb07a58ac5e146a1da664260c16"
}
},
{
"identity" : "uiimagecolors",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jathu/UIImageColors",
"state" : {
"branch" : "master",
"revision" : "f064be8ee0b03158e61135e6c384aee18d7a5414"
}
}
],
"version" : 2
}
32 changes: 32 additions & 0 deletions appiOS/Notflix.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"pins" : [
{
"identity" : "shimmer",
"kind" : "remoteSourceControl",
"location" : "https://github.com/joshuajhomann/Shimmer",
"state" : {
"branch" : "master",
"revision" : "2fde687b3f1d9c5409c53da095d3686361e41343"
}
},
{
"identity" : "swiftui-cached-async-image",
"kind" : "remoteSourceControl",
"location" : "https://github.com/lorenzofiamingo/swiftui-cached-async-image",
"state" : {
"branch" : "main",
"revision" : "2abb11839f80ebb07a58ac5e146a1da664260c16"
}
},
{
"identity" : "uiimagecolors",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jathu/UIImageColors",
"state" : {
"branch" : "master",
"revision" : "f064be8ee0b03158e61135e6c384aee18d7a5414"
}
}
],
"version" : 2
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 0 additions & 10 deletions app-iOS/Podfile → appiOS/Podfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'Notflix' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
platform :ios, '16.0'
pod 'shared', :path => '../shared'
pod 'KMPNativeCoroutinesAsync','0.12.2'






end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions app-iOS/Podfile.lock → appiOS/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PODS:
- KMPNativeCoroutinesAsync (0.12.2):
- KMPNativeCoroutinesCore (= 0.12.2)
- KMPNativeCoroutinesCore (0.12.2)
- shared (1)
- shared (1.0)

DEPENDENCIES:
- KMPNativeCoroutinesAsync (= 0.12.2)
Expand All @@ -20,8 +20,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
KMPNativeCoroutinesAsync: 5fc9ac86b08038e6778b26cc66a71f3446c61e0d
KMPNativeCoroutinesCore: 86877671a38880e692580fab31273fe38fa6f54a
shared: 65a7978bb3fe153f52370158622fb3aee136cca6
shared: c133c49697085ba65e4031b78e671fc97617a40d

PODFILE CHECKSUM: d77dccb4140e3e9ac2d1350298bed9061c7dc2c4
PODFILE CHECKSUM: 7fbc7d629bc54faaa01874dd0d7bbd36d22f8c18

COCOAPODS: 1.11.3
COCOAPODS: 1.12.1

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.

21 changes: 21 additions & 0 deletions appiOS/Pods/KMPNativeCoroutinesAsync/LICENSE.txt

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

Loading

0 comments on commit 234e898

Please sign in to comment.