[#8] Fix PR comment. Renaming files.

blyscuit · Oct 18, 2022 · ed98f64 · ed98f64
1 parent 576332c
commit ed98f64
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 42 deletions.
diff --git a/.github/workflows/deploy_ios_firebase.yml b/.github/workflows/deploy_ios_firebase.yml
@@ -16,21 +16,6 @@ defaults:
     working-directory: iosApp
 
 jobs:
-  Lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        submodules: recursive
-
-    - name: Run SwiftLint
-      uses: norio-nomura/action-swiftlint@3.1.0
-      with:
-        args: --strict
-
   build:
     name: Build
     runs-on: macOS-latest

diff --git a/.github/workflows/deploy_ios_release_firebase.yml b/.github/workflows/deploy_ios_release_firebase.yml
@@ -16,21 +16,6 @@ defaults:
     working-directory: iosApp
 
 jobs:
-  Lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        submodules: recursive
-
-    - name: Run SwiftLint
-      uses: norio-nomura/action-swiftlint@3.1.0
-      with:
-        args: --strict
-
   build:
     name: Build
     runs-on: macOS-latest
@@ -56,7 +41,7 @@ jobs:
       env:
         KMM_KONFIG_PROPERTIES: ${{ secrets.KMM_KONFIG_PROPERTIES }}
       run: |
-        cd ../buildSrc/src/main/kotlin/myPackage
+        cd ../buildSrc/src/main/kotlin/appPackage
         touch BuildKonfig.kt
         echo $KMM_KONFIG_PROPERTIES | base64 --decode > BuildKonfig.kt
 

diff --git a/.github/workflows/ios_review_pull_request.yml b/.github/workflows/ios_review_pull_request.yml
@@ -48,7 +48,7 @@ jobs:
         env:
           KMM_KONFIG_PROPERTIES: ${{ secrets.KMM_KONFIG_PROPERTIES }}
         run: |
-          cd ../buildSrc/src/main/kotlin/myPackage
+          cd ../buildSrc/src/main/kotlin/appPackage
           touch BuildKonfig.kt
           echo $KMM_KONFIG_PROPERTIES | base64 --decode > BuildKonfig.kt
 

diff --git a/.github/workflows/kmm_review_pull_request.yml b/.github/workflows/kmm_review_pull_request.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           KMM_KONFIG_PROPERTIES: ${{ secrets.KMM_KONFIG_PROPERTIES }}
         run: |
-          cd buildSrc/src/main/kotlin/myPackage
+          cd buildSrc/src/main/kotlin/appPackage
           touch BuildKonfig.kt
           echo $KMM_KONFIG_PROPERTIES | base64 --decode > BuildKonfig.kt
 

diff --git a/.gitignore b/.gitignore
@@ -90,4 +90,4 @@ iosApp/DerivedData
 
 .idea
 GoogleService-*.plist
-buildSrc/src/main/kotlin/myPackage/BuildKonfig.kt
+buildSrc/src/main/kotlin/appPackage/BuildKonfig.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,6 @@ buildscript {
         classpath(Dependency.DETEKT)
         classpath(Dependency.KOVER)
         classpath(Dependency.KOTLIN_SERIALIZATION)
-        classpath(Dependency.KOTLIN_TEST)
         classpath(Dependency.BUILD_KONFIG)
     }
 }

diff --git a/...c/src/main/kotlin/myPackage/Dependency.kt → .../src/main/kotlin/appPackage/Dependency.kt b/...c/src/main/kotlin/myPackage/Dependency.kt → .../src/main/kotlin/appPackage/Dependency.kt
diff --git a/...dSrc/src/main/kotlin/myPackage/Modules.kt → ...dSrc/src/main/kotlin/appPackage/Module.kt b/...dSrc/src/main/kotlin/myPackage/Modules.kt → ...dSrc/src/main/kotlin/appPackage/Module.kt
@@ -1,3 +1,3 @@
-object Modules {
+object Module {
     const val JSONAPI_CORE = ":nimble-jsonapi-kotlin:core"
 }
diff --git a/buildSrc/src/main/kotlin/myPackage/Plugin.kt → ...dSrc/src/main/kotlin/appPackage/Plugin.kt b/buildSrc/src/main/kotlin/myPackage/Plugin.kt → ...dSrc/src/main/kotlin/appPackage/Plugin.kt
diff --git a/...Src/src/main/kotlin/myPackage/Versions.kt → ...rc/src/main/kotlin/appPackage/Versions.kt b/...Src/src/main/kotlin/myPackage/Versions.kt → ...rc/src/main/kotlin/appPackage/Versions.kt
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -47,7 +47,7 @@ kotlin {
                 implementation(Dependency.COROUTINES_TEST)
                 implementation(Dependency.KOIN)
                 implementation(Dependency.KOIN_TEST)
-                implementation(project(Modules.JSONAPI_CORE))
+                implementation(project(Module.JSONAPI_CORE))
                 implementation(Dependency.KOTLIN_TEST)
             }
         }
@@ -143,6 +143,16 @@ buildkonfig {
     }
 
     defaultConfigs("production") {
+        buildConfigField(
+            STRING,
+            "CLIENT_ID",
+            BuildKonfig.CLIENT_ID
+        )
+        buildConfigField(
+            STRING,
+            "CLIENT_SECRET",
+            BuildKonfig.CLIENT_SECRET
+        )
         buildConfigField(
             STRING,
             "BASE_URL",
@@ -151,6 +161,16 @@ buildkonfig {
     }
 
     defaultConfigs("staging") {
+        buildConfigField(
+            STRING,
+            "CLIENT_ID_STAGING",
+            BuildKonfig.CLIENT_ID
+        )
+        buildConfigField(
+            STRING,
+            "CLIENT_SECRET_STAGING",
+            BuildKonfig.CLIENT_SECRET
+        )
         buildConfigField(
             STRING,
             "BASE_URL",

diff --git a/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/network/core/NetworkClient.kt b/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/network/core/NetworkClient.kt
@@ -28,11 +28,7 @@ class NetworkClient {
             client = HttpClient() {
                 install(Logging)
                 install(ContentNegotiation) {
-                    json(Json {
-                        prettyPrint = true
-                        isLenient = true
-                        ignoreUnknownKeys = true
-                    })
+                    json(json)
                 }
             }
         } else {