Merge pull request #152 from fassko/1.13

1.13
fassko · Apr 2, 2020 · 4b9de75 · 4b9de75
2 parents 89142de + 3a2101f
commit 4b9de75
Show file tree

Hide file tree

Showing 55 changed files with 272 additions and 179 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj
diff --git a/Dodies.lv.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Dodies.lv.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,24 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Alamofire",
-        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
-        "state": {
-          "branch": null,
-          "revision": "59037bfd28aa963a7916f1eb22a74107a3522f16",
-          "version": "5.0.5"
-        }
-      },
-      {
-        "package": "AlamofireImage",
-        "repositoryURL": "https://github.com/Alamofire/AlamofireImage.git",
-        "state": {
-          "branch": null,
-          "revision": "5384f5509cb37075c468002fb49ffe0faa82e2ad",
-          "version": "4.0.3"
-        }
-      },
       {
         "package": "Cache",
         "repositoryURL": "https://github.com/fassko/Cache",
@@ -37,15 +19,6 @@
           "version": "5.0.0"
         }
       },
-      {
-        "package": "ImageSlideshow",
-        "repositoryURL": "https://github.com/fassko/ImageSlideshow",
-        "state": {
-          "branch": "master",
-          "revision": "25b3a538c698d34f6bebd8fb04441fba07e643de",
-          "version": null
-        }
-      },
       {
         "package": "Imaginary",
         "repositoryURL": "https://github.com/fassko/Imaginary",
@@ -55,15 +28,6 @@
           "version": null
         }
       },
-      {
-        "package": "Kingfisher",
-        "repositoryURL": "https://github.com/onevcat/Kingfisher",
-        "state": {
-          "branch": null,
-          "revision": "56075f629bc3915e1bfa876d175df67e1a7cbe3c",
-          "version": "5.13.2"
-        }
-      },
       {
         "package": "Lightbox",
         "repositoryURL": "https://github.com/fassko/Lightbox",
@@ -96,7 +60,7 @@
         "repositoryURL": "https://github.com/realm/realm-cocoa.git",
         "state": {
           "branch": "master",
-          "revision": "9011b2df17019552d7acae3ed085bf8c01a6a38f",
+          "revision": "c766959951702087b70b3dd748d78e87b43a3bf9",
           "version": null
         }
       },
@@ -109,15 +73,6 @@
           "version": "5.23.8"
         }
       },
-      {
-        "package": "SDWebImage",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git",
-        "state": {
-          "branch": null,
-          "revision": "2dcf1b65994d92ef8806f52dc41aa6fdd677489c",
-          "version": "5.6.1"
-        }
-      },
       {
         "package": "SwiftSpinner",
         "repositoryURL": "https://github.com/icanzilb/SwiftSpinner",

diff --git a/Dodies.lv.xcworkspace/contents.xcworkspacedata b/Dodies.lv.xcworkspace/contents.xcworkspacedata
diff --git a/Dodies.lv.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Dodies.lv.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Dodies.lv.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Dodies.lv.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,88 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Cache",
+        "repositoryURL": "https://github.com/fassko/Cache",
+        "state": {
+          "branch": "master",
+          "revision": "fa7f1aadd88428d05ff3bfcf7096a10a3f888a18",
+          "version": null
+        }
+      },
+      {
+        "package": "HTMLString",
+        "repositoryURL": "https://github.com/alexaubry/HTMLString",
+        "state": {
+          "branch": null,
+          "revision": "373048cc4084dd7481c86e3bee41612eff93b14d",
+          "version": "5.0.0"
+        }
+      },
+      {
+        "package": "Imaginary",
+        "repositoryURL": "https://github.com/fassko/Imaginary",
+        "state": {
+          "branch": "master",
+          "revision": "2847cd255160dabf4317d08843ab6ed8d16f2a67",
+          "version": null
+        }
+      },
+      {
+        "package": "Lightbox",
+        "repositoryURL": "https://github.com/fassko/Lightbox",
+        "state": {
+          "branch": "master",
+          "revision": "b2b00a26165ab9bc66c2a9adf7bef0cfc8249cd9",
+          "version": null
+        }
+      },
+      {
+        "package": "Localize_Swift",
+        "repositoryURL": "https://github.com/marmelroy/Localize-Swift",
+        "state": {
+          "branch": null,
+          "revision": "f2d0c6d790b8af64ae54377ad93494e8d3e46b17",
+          "version": "3.1.0"
+        }
+      },
+      {
+        "package": "PromiseKit",
+        "repositoryURL": "https://github.com/mxcl/PromiseKit.git",
+        "state": {
+          "branch": null,
+          "revision": "f14f16cc2602afec1030e4f492100d6d43dca544",
+          "version": "6.13.1"
+        }
+      },
+      {
+        "package": "Realm",
+        "repositoryURL": "https://github.com/realm/realm-cocoa.git",
+        "state": {
+          "branch": "master",
+          "revision": "c766959951702087b70b3dd748d78e87b43a3bf9",
+          "version": null
+        }
+      },
+      {
+        "package": "RealmCore",
+        "repositoryURL": "https://github.com/realm/realm-core",
+        "state": {
+          "branch": null,
+          "revision": "35662ff940e340bf630ad1d1d88acfc7af18bee6",
+          "version": "5.23.8"
+        }
+      },
+      {
+        "package": "SwiftSpinner",
+        "repositoryURL": "https://github.com/icanzilb/SwiftSpinner",
+        "state": {
+          "branch": null,
+          "revision": "b11109c98524526af3a1c6f69c5818862acda6fb",
+          "version": "2.1.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Dodies.lv/AppDelegate.swift b/Dodies.lv/AppDelegate.swift
@@ -19,9 +19,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_ application: UIApplication,
                    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
     Realm.Configuration.defaultConfiguration = Realm.Configuration(
-      schemaVersion: 7,
+      schemaVersion: 8,
       migrationBlock: { migration, oldSchemaVersion in
-        if oldSchemaVersion < 7 {
+        if oldSchemaVersion < 8 {
           migration.deleteData(forType: DodiesPoint.className())
         }
     })

diff --git a/Dodies.lv/DetailsViewController.swift b/Dodies.lv/DetailsViewController.swift
@@ -15,7 +15,6 @@ import Lightbox
 import SafariServices
 import HTMLString
 import ImageSlideshow
-import ImageSlideshowKingfisher
 
 class DetailsViewController: UIViewController, Storyboarded {
 

diff --git a/Dodies.lv/Info.plist b/Dodies.lv/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.11.0.190929.1035</string>
+	<string>1.13.200401.1912</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Dodies.lv/MapViewController.swift b/Dodies.lv/MapViewController.swift
@@ -156,7 +156,7 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, Storyboard
             .filter("name BEGINSWITH 'Viesatas upesloku taka'")
         } else {
           return realm.objects(DodiesPoint.self)
-            .filter("txt != ''")
+          .filter("txt != ''")
         }
       }()
 

diff --git a/Dodies.lvUITests/Info.plist b/Dodies.lvUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.11.0.190929.1035</string>
+	<string>1.13.200401.1912</string>
 </dict>
 </plist>
diff --git a/Dodies.paw b/Dodies.paw
diff --git a/Podfile b/Podfile
@@ -0,0 +1,10 @@
+platform :ios, '12.0'
+
+target 'Dodies.lv' do
+  use_frameworks!
+
+  pod 'Kingfisher'
+  pod 'ImageSlideshow'
+  pod 'ImageSlideshow/Kingfisher'
+
+end
diff --git a/Podfile.lock b/Podfile.lock
@@ -0,0 +1,28 @@
+PODS:
+  - ImageSlideshow (1.8.3):
+    - ImageSlideshow/Core (= 1.8.3)
+  - ImageSlideshow/Core (1.8.3)
+  - ImageSlideshow/Kingfisher (1.8.3):
+    - ImageSlideshow/Core
+    - Kingfisher (> 3.0)
+  - Kingfisher (5.13.2):
+    - Kingfisher/Core (= 5.13.2)
+  - Kingfisher/Core (5.13.2)
+
+DEPENDENCIES:
+  - ImageSlideshow
+  - ImageSlideshow/Kingfisher
+  - Kingfisher
+
+SPEC REPOS:
+  trunk:
+    - ImageSlideshow
+    - Kingfisher
+
+SPEC CHECKSUMS:
+  ImageSlideshow: 4694d7d699a1549582e7cc631fb392d8f91630f3
+  Kingfisher: d342c8354c10c3d85a27d6d4c42c41285924b898
+
+PODFILE CHECKSUM: 5bf24953f6cb11c6516abf8baba083bfb6b92b8a
+
+COCOAPODS: 1.9.1
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -22,7 +22,7 @@ platform :ios do
     increment_build_number build_number: get_version_number + "." + Time.new.strftime("%y%m%d.%H%M")
 
     gym(
-      project: "Dodies.lv.xcodeproj",
+      workspace: "Dodies.lv.xcworkspace",
       scheme: "Dodies.lv",
       clean: true,
       output_name: "Dodies.lv.ipa",
@@ -33,11 +33,10 @@ platform :ios do
   desc "Test"
   lane :test do
     scan(
-      project: "Dodies.lv.xcodeproj",
+      workspace: "Dodies.lv.xcworkspace",
 			scheme: "Dodies.lv",
 			clean: true,
       devices: ["iPhone X"]
-      # devices: ["iPhone X", "iPad (5th generation)"]
     )
   end
 

diff --git a/fastlane/Gymfile b/fastlane/Gymfile
@@ -12,7 +12,7 @@
 
 output_directory "./"
 
-project "Dodies.lv.xcodeproj"
+workspace "Dodies.lv.xcworkspace"
 scheme "Dodies.lv"
 clean true
 output_name "Dodies.lv.ipa"

diff --git a/fastlane/metadata/app_icon.jpg b/fastlane/metadata/app_icon.jpg
diff --git a/fastlane/metadata/copyright.txt b/fastlane/metadata/copyright.txt
@@ -1 +1 @@
-Kristaps Grinbergs
+Kristaps Grinbergs
diff --git a/fastlane/metadata/en-US/apple_tv_privacy_policy.txt b/fastlane/metadata/en-US/apple_tv_privacy_policy.txt
@@ -0,0 +1 @@
+
diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt
@@ -6,4 +6,4 @@ Mūsu kartē attēlotas visiem pieejami bezmaksas objekti, galvenokārt, vietas
 Pārsvarā ir iekļautas nekomerciālas vietas, izņemot, ja norādīts citādāk. Vietām, kuras esam apmeklējuši paši, ir arī bildes un plašāks apraksts. Dati ievākti no dažādiem avotiem: DAP, LVM, pašvaldību mājaslapām. Liela daļa ir pārbaudīta dzīvē, tās kartē un tabulā ir iekrāsotas zaļas.
 
 
-Continued use of GPS running in the background can dramatically decrease battery life.
+Continued use of GPS running in the background can dramatically decrease battery life.
diff --git a/fastlane/metadata/en-US/keywords.txt b/fastlane/metadata/en-US/keywords.txt
@@ -1 +1 @@
-dodies,daba,pārgājieni,takas,karte,latvija,latvia,piknins,taka,mežs,upes,ugunskurs,vasara,telts
+dodies,daba,pārgājieni,takas,karte,latvija,latvia,piknins,taka,mežs,upes,ugunskurs,vasara,telts
diff --git a/fastlane/metadata/en-US/marketing_url.txt b/fastlane/metadata/en-US/marketing_url.txt
@@ -1 +1 @@
-http://dodies.lv
+https://dodies.lv