Changes list of variants in variants.yml from array to dictionary

Sources/VariantsCore/Schemas/Android/AndroidConfiguration.swift

@@ -23,4 +23,47 @@ public struct AndroidConfiguration: Codable {
         case signing = "signing"
         case custom = "custom"
     }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let variants = try container.decode([String: UnnamedAndroidVariant].self, forKey: .variants)
+
+        var definiteVariants: [AndroidVariant] = []
+        variants.forEach({ (name, variant) in
+            definiteVariants.append(
+                AndroidVariant(name: name,
+                               versionName: variant.versionName,
+                               versionCode: variant.versionCode,
+                               idSuffix: variant.idSuffix,
+                               taskBuild: variant.taskBuild,
+                               taskUnitTest: variant.taskUnitTest,
+                               taskUitest: variant.taskUitest,
+                               custom: variant.custom,
+                               store_destination: variant.store_destination)
+            )
+        })
+
+        self.path = try container.decode(String.self, forKey: .path)
+        self.appName = try container.decode(String.self, forKey: .appName)
+        self.appIdentifier = try container.decode(String.self, forKey: .appIdentifier)
+        self.variants = definiteVariants
+        self.signing = try container.decode(AndroidSigning.self, forKey: .signing)
+        self.custom = try? container.decode([CustomProperty].self, forKey: .custom)
+    }
+
+    public init(
+        path: String,
+        appName: String,
+        appIdentifier: String,
+        variants: [AndroidVariant],
+        signing: AndroidSigning?,
+        custom: [CustomProperty]?
+    ) {
+        self.path = path
+        self.appName = appName
+        self.appIdentifier = appIdentifier
+        self.variants = variants
+        self.signing = signing
+        self.custom = custom
+    }
 }

Sources/VariantsCore/Schemas/Android/AndroidVariant.swift

@@ -69,3 +69,29 @@ extension AndroidVariant {
         case playStore = "playstore"
     }
 }
+
+/*
+ * Used by `AndroidConfiguration` decode variant from YAML spec
+ * as dictionary `[String: UnnamedAndroidVariant]` and expose array `[AndroidVariant]`.
+ */
+struct UnnamedAndroidVariant: Codable {
+    let versionName: String
+    let versionCode: String
+    let idSuffix: String?
+    let taskBuild: String
+    let taskUnitTest: String
+    let taskUitest: String
+    let custom: [CustomProperty]?
+    internal let store_destination: String?
+
+    enum CodingKeys: String, CodingKey {
+        case versionName = "version_name"
+        case versionCode = "version_code"
+        case idSuffix = "id_suffix"
+        case taskBuild = "task_build"
+        case taskUnitTest = "task_unittest"
+        case taskUitest = "task_uitest"
+        case custom = "custom"
+        case store_destination
+    }
+}

Sources/VariantsCore/Schemas/iOS/iOSConfiguration.swift

@@ -22,10 +22,10 @@ public struct iOSConfiguration: Codable {
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        let variants = try container.decode([iOSVariant].self, forKey: .variants)
+        let variants = try container.decode([String: UnnamediOSVariant].self, forKey: .variants)
         let globalSigning = try? container.decode(iOSSigning.self, forKey: .signing)
 
-        guard globalSigning != nil || variants.filter({ $0.signing == nil }).isEmpty else {
+        guard globalSigning != nil || variants.map(\.value).filter({ $0.signing == nil }).isEmpty else {
             throw RuntimeError(
                 """
                 At least one variant doesn't contain a 'signing' configuration.
@@ -34,7 +34,8 @@ public struct iOSConfiguration: Codable {
         }
 
         var definiteVariants: [iOSVariant] = []
-        try variants.forEach { variant in
+
+        try variants.forEach({ (name, variant) in
             var signing = globalSigning
 
             if let variantSigning = variant.signing {
@@ -44,7 +45,7 @@ public struct iOSConfiguration: Codable {
             }
 
             definiteVariants.append(
-                iOSVariant(name: variant.name,
+                iOSVariant(name: name,
                            app_icon: variant.app_icon,
                            id_suffix: variant.id_suffix,
                            version_name: variant.version_name,
@@ -53,7 +54,7 @@ public struct iOSConfiguration: Codable {
                            custom: variant.custom,
                            store_destination: variant.store_destination)
             )
-        }
+        })
 
         self.xcodeproj = try container.decode(String.self, forKey: .xcodeproj)
         self.targets = try container.decode([String: iOSTarget].self, forKey: .targets)

Sources/VariantsCore/Schemas/iOS/iOSVariant.swift

@@ -77,3 +77,17 @@ extension iOSVariant {
         case testFlight = "testflight"
     }
 }
+
+/*
+ * Used by `iOSConfiguration` decode variant from YAML spec
+ * as dictionary `[String: UnnamediOSVariant]` and expose array `[iOSVariant]`.
+ */
+struct UnnamediOSVariant: Codable {
+    let app_icon: String?
+    let id_suffix: String?
+    let version_name: String
+    let version_number: Int
+    let signing: iOSSigning?
+    let custom: [CustomProperty]?
+    internal let store_destination: String?
+}

Templates/android/variants-template.yml

@@ -8,9 +8,9 @@ android:
     app_name: {{ APP_NAME }}
     app_identifier: {{ APP_IDENTIFIER }}
     variants:
-      # Default variant is mandatory, do not remove
-      # Usually regarded as `production` variant.
-        - name: default
+        # Default variant is mandatory, do not remove
+        # Usually regarded as `production` variant.
+        default:
           version_name: 0.0.1
           version_code: 1
           task_build: bundleProdRelease
@@ -31,7 +31,9 @@ android:
             - name: SAMPLE_PROPERTY
               value: "{{ envVars.SAMPLE_ENVIRONMENT_VARIABLE }}"
               destination: fastlane
-        - name: BETA
+
+        # Sample variant "BETA"
+        BETA:
           id_suffix: beta
           version_name: 0.0.1
           version_code: 1

Templates/ios/variants-template.yml

@@ -15,8 +15,8 @@ ios:
           info: {{ INFO_PLIST }}
           config: {{ SOURCE }}
     variants:
-        # Default variant is mandatory, do not remove
-      - name: default
+      # Default variant is mandatory, do not remove
+      default:
         version_name: 0.0.1
         version_number: 1
         #
@@ -48,11 +48,11 @@ ios:
             - name: SAMPLE_FASTLANE_PROPERTY
               value: This will be available to fastlane
               destination: fastlane
-        #
-        # Sample variant, "beta".
-        # Only `name` and `id_suffix` are mandatory fields
-        #
-      - name: BETA
+      #
+      # Sample variant, "beta".
+      # Only `name` and `id_suffix` are mandatory fields
+      #
+      BETA:
         id_suffix: beta
         # If app_icon isn't specified, the value fallbacks to target.app_icon
         app_icon: AppIcon.beta
@@ -96,7 +96,7 @@ ios:
     # Comment or delete section below if necessary.
     # ----------------------------------------------------------------------
 
-    custom:
-        - name: SAMPLE_PROPERTY
-          value: Sample value
-          destination: project
+    #custom:
+    #    - name: SAMPLE_PROPERTY
+    #      value: Sample value
+    #      destination: project

Tests/VariantsCoreTests/GradleScriptFactoryTests.swift

@@ -33,7 +33,7 @@ class GradleScriptFactoryTests: XCTestCase {
             }
         }
         """
-
+    
     let androidConfiguration = AndroidConfiguration(
         path: "projectPath",
         appName: "TestApp",

Tests/VariantsCoreTests/Resources/invalid_variants.yml

@@ -7,7 +7,7 @@ android:
   app_name: FrankBank
   app_identifier: com.backbase.frank
   variants:
-    - name: default
+    default:
       version_name: 0.0.1
       version_code: 1
       task_build: bundleProdRelease
@@ -17,7 +17,7 @@ android:
         - name: SAMPLE_PROJECT
           value: Sample Project Default Config
           destination: project
-    - name: test
+    test:
       id_suffix: dev
       task_build: assembleDevelop
       task_unittest: testDevDebugUnitTest
@@ -77,13 +77,13 @@ ios:
           info: Sources/Info.plist
           config: Sources
     variants:
-      - name: default
+      default:
         version_name: 0.0.1
         version_number: 1
         custom:
             - key: SAMPLE_CONFIG
               value: Production Value
-      - name: BETA
+      BETA:
         id_suffix: beta
         app_icon: AppIcon.beta
         version_name: 0.0.1

Tests/VariantsCoreTests/Resources/ios/invalid_missing_export_method.yml

@@ -14,7 +14,7 @@ ios:
           info: Sources/Info.plist
           config: Sources
     variants:
-      - name: default
+      default:
         version_name: 0.0.1
         version_number: 1
         signing:
@@ -26,7 +26,7 @@ ios:
             - name: SAMPLE_CONFIG
               value: Production Value
               destination: project
-      - name: BETA
+      BETA:
         id_suffix: beta
         app_icon: AppIcon.beta
         version_name: 0.0.1
@@ -36,7 +36,7 @@ ios:
             - name: SAMPLE_CONFIG
               value: BETA Value
               destination: fastlane
-      - name: STG
+      STG:
         id_suffix: staging
         version_name: 0.0.1
         version_number: 1

Tests/VariantsCoreTests/Resources/ios/invalid_missing_signing_configuration.yml

@@ -14,7 +14,7 @@ ios:
           info: Sources/Info.plist
           config: Sources
     variants:
-      - name: default
+      default:
         version_name: 0.0.1
         version_number: 1
         signing:
@@ -26,7 +26,7 @@ ios:
             - name: SAMPLE_CONFIG
               value: Production Value
               destination: project
-      - name: BETA
+      BETA:
         id_suffix: beta
         app_icon: AppIcon.beta
         version_name: 0.0.1
@@ -36,7 +36,7 @@ ios:
             - name: SAMPLE_CONFIG
               value: BETA Value
               destination: fastlane
-      - name: STG
+      STG:
         id_suffix: staging
         version_name: 0.0.1
         version_number: 1

Tests/VariantsCoreTests/Resources/valid_variants.yml

@@ -7,7 +7,7 @@ android:
   app_name: FrankBank
   app_identifier: com.backbase.frank
   variants:
-    - name: default
+    default:
       version_name: 0.0.1
       version_code: 1
       task_build: bundleProdRelease
@@ -18,7 +18,7 @@ android:
         - name: SAMPLE_PROJECT
           value: Sample Project Default Config
           destination: project
-    - name: test
+    test:
       id_suffix: dev
       version_name: 0.0.1
       version_code: 1
@@ -76,7 +76,7 @@ ios:
           info: Sources/Info.plist
           config: Sources
     variants:
-      - name: default
+      default:
         version_name: 0.0.1
         version_number: 1
         signing:
@@ -88,7 +88,7 @@ ios:
             - name: SAMPLE_CONFIG
               value: Production Value
               destination: project
-      - name: BETA
+      BETA:
         id_suffix: beta
         app_icon: AppIcon.beta
         version_name: 0.0.1
@@ -98,7 +98,7 @@ ios:
             - name: SAMPLE_CONFIG
               value: BETA Value
               destination: fastlane
-      - name: STG
+      STG:
         id_suffix: staging
         version_name: 0.0.1
         version_number: 1

Tests/VariantsCoreTests/Resources/variants-template.yml

@@ -15,8 +15,8 @@ ios:
           info: {{ INFO_PLIST }}
           config: {{ SOURCE }}
     variants:
-        # Default variant is mandatory, do not remove
-      - name: default
+      # Default variant is mandatory, do not remove
+      default:
         version_name: 0.0.1
         version_number: 1
         #
@@ -31,11 +31,11 @@ ios:
             - name: SAMPLE_FASTLANE_PROPERTY
               value: This will be available to fastlane
               destination: fastlane
-        #
-        # Sample variant, "beta".
-        # Only `name` and `id_suffix` are mandatory fields
-        #
-      - name: BETA
+      #
+      # Sample variant, "beta".
+      # Only `name` and `id_suffix` are mandatory fields
+      #
+      BETA:
         id_suffix: beta
         # If app_icon isn't specified, the value fallbacks to target.app_icon
         app_icon: AppIcon.beta

Tests/VariantsCoreTests/YamlParserTests.swift

@@ -170,8 +170,8 @@ class YamlParserTests: XCTestCase {
             XCTAssertEqual(configuration.android?.appIdentifier, "com.backbase.frank")
             XCTAssertEqual(configuration.android?.path, ".")
             XCTAssertEqual(configuration.android?.variants.count, 2)
-            XCTAssertEqual(configuration.android?.variants.first?.name, "default")
-            XCTAssertEqual(configuration.android?.variants.last?.name, "test")
+            XCTAssertTrue(((configuration.android?.variants.map(\.name).contains("default")) != nil))
+            XCTAssertTrue(((configuration.android?.variants.map(\.name).contains("test")) != nil))
 
             let customConfigDefault = configuration.android?
                 .variants.first(where: { $0.name == "default" })?