Fix mapping of the builtin Float scalar type (#6047)

* Map Float to Double in scalar types * Update .expected * Run CI on macos-latest * Try to make IdlingResourceTest pass * Try to make tests pass * Try to make tests pass
apollographql · Jul 11, 2024 · 3dda73d · 3dda73d
1 parent 70f99a0
commit 3dda73d
Show file tree

Hide file tree

Showing 289 changed files with 293 additions and 292 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   tests-gradle:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 #v3
       - uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 #v3
@@ -39,7 +39,7 @@ jobs:
           path: diagnostics.zip
 
   tests-no-gradle:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 #v3
       - uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 #v3
@@ -65,7 +65,7 @@ jobs:
           path: diagnostics.zip
 
   tests-integration:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 #v3
       - uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 #v3

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: macos-11
+    runs-on: macos-latest
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 #v3

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish:
-    runs-on: macos-11
+    runs-on: macos-latest
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 #v3

diff --git a/...iler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/TypesBuilder.kt b/...iler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/TypesBuilder.kt
@@ -35,7 +35,7 @@ internal fun IrCustomScalar.typeFieldSpec(): FieldSpec {
 
 private fun builtinScalarJavaName(name: String): String? = when (name) {
   "Int" -> "java.lang.Integer"
-  "Float" -> "java.lang.Float"
+  "Float" -> "java.lang.Double"
   "String" -> "java.lang.String"
   "Boolean" -> "java.lang.Boolean"
   "ID" -> "java.lang.String"

diff --git a/...er/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/TypesBuilder.kt b/...er/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/TypesBuilder.kt
@@ -31,7 +31,7 @@ internal fun IrCustomScalar.typePropertySpec(): PropertySpec {
 
 private fun builtinScalarKotlinName(name: String): String? = when (name) {
   "Int" -> "kotlin.Int"
-  "Float" -> "kotlin.Float"
+  "Float" -> "kotlin.Double"
   "String" -> "kotlin.String"
   "Boolean" -> "kotlin.Boolean"
   "ID" -> "kotlin.String"

diff --git a/...graphql/com/example/__schema/java/operationBased/__schema/type/GraphQLFloat.java.expected b/...graphql/com/example/__schema/java/operationBased/__schema/type/GraphQLFloat.java.expected
diff --git a/.../graphql/com/example/__schema/kotlin/responseBased/__schema/type/GraphQLFloat.kt.expected b/.../graphql/com/example/__schema/kotlin/responseBased/__schema/type/GraphQLFloat.kt.expected
diff --git a/...com/example/antlr_tokens/java/operationBased/antlr_tokens/type/GraphQLFloat.java.expected b/...com/example/antlr_tokens/java/operationBased/antlr_tokens/type/GraphQLFloat.java.expected
diff --git a/.../com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/type/GraphQLFloat.kt.expected b/.../com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/type/GraphQLFloat.kt.expected
diff --git a/...guments_hardcoded/java/operationBased/arguments_hardcoded/type/GraphQLFloat.java.expected b/...guments_hardcoded/java/operationBased/arguments_hardcoded/type/GraphQLFloat.java.expected
diff --git a/...rguments_hardcoded/kotlin/responseBased/arguments_hardcoded/type/GraphQLFloat.kt.expected b/...rguments_hardcoded/kotlin/responseBased/arguments_hardcoded/type/GraphQLFloat.kt.expected
diff --git a/...raphql/com/example/big_query/kotlin/responseBased/big_query/type/GraphQLFloat.kt.expected b/...raphql/com/example/big_query/kotlin/responseBased/big_query/type/GraphQLFloat.kt.expected
diff --git a/...capitalized_fields/java/operationBased/capitalized_fields/type/GraphQLFloat.java.expected b/...capitalized_fields/java/operationBased/capitalized_fields/type/GraphQLFloat.java.expected
diff --git a/...example/capitalized_fields/kotlin/compat/capitalized_fields/type/GraphQLFloat.kt.expected b/...example/capitalized_fields/kotlin/compat/capitalized_fields/type/GraphQLFloat.kt.expected
diff --git a/...capitalized_fields/kotlin/operationBased/capitalized_fields/type/GraphQLFloat.kt.expected b/...capitalized_fields/kotlin/operationBased/capitalized_fields/type/GraphQLFloat.kt.expected
diff --git a/.../capitalized_fields/kotlin/responseBased/capitalized_fields/type/GraphQLFloat.kt.expected b/.../capitalized_fields/kotlin/responseBased/capitalized_fields/type/GraphQLFloat.kt.expected
diff --git a/...se_sensitive_enum/java/operationBased/case_sensitive_enum/type/GraphQLFloat.java.expected b/...se_sensitive_enum/java/operationBased/case_sensitive_enum/type/GraphQLFloat.java.expected
diff --git a/...ase_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/GraphQLFloat.kt.expected b/...ase_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/GraphQLFloat.kt.expected
diff --git a/...aphql/com/example/companion/java/operationBased/companion/type/GraphQLFloat.java.expected b/...aphql/com/example/companion/java/operationBased/companion/type/GraphQLFloat.java.expected
diff --git a/...aphql/com/example/companion/kotlin/operationBased/companion/type/GraphQLFloat.kt.expected b/...aphql/com/example/companion/kotlin/operationBased/companion/type/GraphQLFloat.kt.expected
diff --git a/...custom_scalar_type/java/operationBased/custom_scalar_type/type/GraphQLFloat.java.expected b/...custom_scalar_type/java/operationBased/custom_scalar_type/type/GraphQLFloat.java.expected
diff --git a/.../custom_scalar_type/kotlin/responseBased/custom_scalar_type/type/GraphQLFloat.kt.expected b/.../custom_scalar_type/kotlin/responseBased/custom_scalar_type/type/GraphQLFloat.kt.expected
diff --git a/...m/example/data_builders/java/operationBased/data_builders/type/GraphQLFloat.java.expected b/...m/example/data_builders/java/operationBased/data_builders/type/GraphQLFloat.java.expected
diff --git a/...aphql/com/example/data_builders/kotlin/compat/data_builders/type/GraphQLFloat.kt.expected b/...aphql/com/example/data_builders/kotlin/compat/data_builders/type/GraphQLFloat.kt.expected
diff --git a/...m/example/data_builders/kotlin/operationBased/data_builders/type/GraphQLFloat.kt.expected b/...m/example/data_builders/kotlin/operationBased/data_builders/type/GraphQLFloat.kt.expected
diff --git a/...om/example/data_builders/kotlin/responseBased/data_builders/type/GraphQLFloat.kt.expected b/...om/example/data_builders/kotlin/responseBased/data_builders/type/GraphQLFloat.kt.expected
diff --git a/...pitalized_fields/java/operationBased/decapitalized_fields/type/GraphQLFloat.java.expected b/...pitalized_fields/java/operationBased/decapitalized_fields/type/GraphQLFloat.java.expected
diff --git a/...ple/decapitalized_fields/kotlin/compat/decapitalized_fields/type/GraphQLFloat.kt.expected b/...ple/decapitalized_fields/kotlin/compat/decapitalized_fields/type/GraphQLFloat.kt.expected
diff --git a/...pitalized_fields/kotlin/operationBased/decapitalized_fields/type/GraphQLFloat.kt.expected b/...pitalized_fields/kotlin/operationBased/decapitalized_fields/type/GraphQLFloat.kt.expected
diff --git a/...apitalized_fields/kotlin/responseBased/decapitalized_fields/type/GraphQLFloat.kt.expected b/...apitalized_fields/kotlin/responseBased/decapitalized_fields/type/GraphQLFloat.kt.expected
diff --git a/..._merged_field/java/operationBased/deprecated_merged_field/type/GraphQLFloat.java.expected b/..._merged_field/java/operationBased/deprecated_merged_field/type/GraphQLFloat.java.expected
diff --git a/...precated_merged_field/kotlin/compat/deprecated_merged_field/type/GraphQLFloat.kt.expected b/...precated_merged_field/kotlin/compat/deprecated_merged_field/type/GraphQLFloat.kt.expected
diff --git a/..._merged_field/kotlin/operationBased/deprecated_merged_field/type/GraphQLFloat.kt.expected b/..._merged_field/kotlin/operationBased/deprecated_merged_field/type/GraphQLFloat.kt.expected
diff --git a/...d_merged_field/kotlin/responseBased/deprecated_merged_field/type/GraphQLFloat.kt.expected b/...d_merged_field/kotlin/responseBased/deprecated_merged_field/type/GraphQLFloat.kt.expected
diff --git a/...l/com/example/deprecation/java/operationBased/deprecation/type/GraphQLFloat.java.expected b/...l/com/example/deprecation/java/operationBased/deprecation/type/GraphQLFloat.java.expected
diff --git a/...ql/com/example/deprecation/kotlin/responseBased/deprecation/type/GraphQLFloat.kt.expected b/...ql/com/example/deprecation/kotlin/responseBased/deprecation/type/GraphQLFloat.kt.expected
diff --git a/.../test/graphql/com/example/empty/java/operationBased/empty/type/GraphQLFloat.java.expected b/.../test/graphql/com/example/empty/java/operationBased/empty/type/GraphQLFloat.java.expected
diff --git a/...c/test/graphql/com/example/empty/kotlin/responseBased/empty/type/GraphQLFloat.kt.expected b/...c/test/graphql/com/example/empty/kotlin/responseBased/empty/type/GraphQLFloat.kt.expected
diff --git a/...hql/com/example/enum_field/java/operationBased/enum_field/type/GraphQLFloat.java.expected b/...hql/com/example/enum_field/java/operationBased/enum_field/type/GraphQLFloat.java.expected
diff --git a/...phql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLFloat.kt.expected b/...phql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLFloat.kt.expected
diff --git a/...ample/enums_as_sealed/java/operationBased/enums_as_sealed/type/GraphQLFloat.java.expected b/...ample/enums_as_sealed/java/operationBased/enums_as_sealed/type/GraphQLFloat.java.expected
diff --git a/...xample/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/GraphQLFloat.kt.expected b/...xample/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/GraphQLFloat.kt.expected
diff --git a/...irective/java/operationBased/field_with_include_directive/type/GraphQLFloat.java.expected b/...irective/java/operationBased/field_with_include_directive/type/GraphQLFloat.java.expected
diff --git a/...directive/kotlin/responseBased/field_with_include_directive/type/GraphQLFloat.kt.expected b/...directive/kotlin/responseBased/field_with_include_directive/type/GraphQLFloat.kt.expected
diff --git a/...le_super/java/operationBased/fieldset_with_multiple_super/type/GraphQLFloat.java.expected b/...le_super/java/operationBased/fieldset_with_multiple_super/type/GraphQLFloat.java.expected
diff --git a/...h_multiple_super/kotlin/compat/fieldset_with_multiple_super/type/GraphQLFloat.kt.expected b/...h_multiple_super/kotlin/compat/fieldset_with_multiple_super/type/GraphQLFloat.kt.expected
diff --git a/...le_super/kotlin/operationBased/fieldset_with_multiple_super/type/GraphQLFloat.kt.expected b/...le_super/kotlin/operationBased/fieldset_with_multiple_super/type/GraphQLFloat.kt.expected
diff --git a/...ple_super/kotlin/responseBased/fieldset_with_multiple_super/type/GraphQLFloat.kt.expected b/...ple_super/kotlin/responseBased/fieldset_with_multiple_super/type/GraphQLFloat.kt.expected
diff --git a/...ava/operationBased/fragment_spread_with_include_directive/type/GraphQLFloat.java.expected b/...ava/operationBased/fragment_spread_with_include_directive/type/GraphQLFloat.java.expected