Skip to content

Commit a23a5cc

Browse files
authored
Merge pull request #25 from valpackett/master
lua/elixir build fixes
2 parents ec7086d + 5309300 commit a23a5cc

File tree

1,132 files changed

+3066
-3951
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,132 files changed

+3066
-3951
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,5 +218,4 @@ jobs:
218218
- name: Check lua
219219
working-directory: ./lua
220220
run: |
221-
luarocks install ./*.rockspec --check-lua-versions
222-
luarocks test
221+
luarocks make ./*.rockspec --check-lua-versions

android/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.7.0-SNAPSHOT
1+
7.8.0-SNAPSHOT

android/docs/GetRecipeInformation200ResponseExtendedIngredientsInner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
88
------------ | ------------- | ------------- | -------------
99
**aisle** | **String** | |
1010
**amount** | [**BigDecimal**](BigDecimal.md) | |
11-
**consitency** | **String** | |
11+
**consistency** | **String** | |
1212
**id** | **Integer** | |
1313
**image** | **String** | |
1414
**measures** | [**GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures**](GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures.md) | | [optional]

android/docs/RecipesApi.md

Lines changed: 10 additions & 20 deletions
Large diffs are not rendered by default.

android/src/main/java/com/spoonacular/RecipesApi.java

Lines changed: 15 additions & 30 deletions
Large diffs are not rendered by default.

android/src/main/java/com/spoonacular/client/model/GetRecipeInformation200ResponseExtendedIngredientsInner.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class GetRecipeInformation200ResponseExtendedIngredientsInner {
2525
private String aisle = null;
2626
@SerializedName("amount")
2727
private BigDecimal amount = null;
28-
@SerializedName("consitency")
29-
private String consitency = null;
28+
@SerializedName("consistency")
29+
private String consistency = null;
3030
@SerializedName("id")
3131
private Integer id = null;
3232
@SerializedName("image")
@@ -67,11 +67,11 @@ public void setAmount(BigDecimal amount) {
6767
/**
6868
**/
6969
@ApiModelProperty(required = true, value = "")
70-
public String getConsitency() {
71-
return consitency;
70+
public String getConsistency() {
71+
return consistency;
7272
}
73-
public void setConsitency(String consitency) {
74-
this.consitency = consitency;
73+
public void setConsistency(String consistency) {
74+
this.consistency = consistency;
7575
}
7676

7777
/**
@@ -166,7 +166,7 @@ public boolean equals(Object o) {
166166
GetRecipeInformation200ResponseExtendedIngredientsInner getRecipeInformation200ResponseExtendedIngredientsInner = (GetRecipeInformation200ResponseExtendedIngredientsInner) o;
167167
return (this.aisle == null ? getRecipeInformation200ResponseExtendedIngredientsInner.aisle == null : this.aisle.equals(getRecipeInformation200ResponseExtendedIngredientsInner.aisle)) &&
168168
(this.amount == null ? getRecipeInformation200ResponseExtendedIngredientsInner.amount == null : this.amount.equals(getRecipeInformation200ResponseExtendedIngredientsInner.amount)) &&
169-
(this.consitency == null ? getRecipeInformation200ResponseExtendedIngredientsInner.consitency == null : this.consitency.equals(getRecipeInformation200ResponseExtendedIngredientsInner.consitency)) &&
169+
(this.consistency == null ? getRecipeInformation200ResponseExtendedIngredientsInner.consistency == null : this.consistency.equals(getRecipeInformation200ResponseExtendedIngredientsInner.consistency)) &&
170170
(this.id == null ? getRecipeInformation200ResponseExtendedIngredientsInner.id == null : this.id.equals(getRecipeInformation200ResponseExtendedIngredientsInner.id)) &&
171171
(this.image == null ? getRecipeInformation200ResponseExtendedIngredientsInner.image == null : this.image.equals(getRecipeInformation200ResponseExtendedIngredientsInner.image)) &&
172172
(this.measures == null ? getRecipeInformation200ResponseExtendedIngredientsInner.measures == null : this.measures.equals(getRecipeInformation200ResponseExtendedIngredientsInner.measures)) &&
@@ -182,7 +182,7 @@ public int hashCode() {
182182
int result = 17;
183183
result = 31 * result + (this.aisle == null ? 0: this.aisle.hashCode());
184184
result = 31 * result + (this.amount == null ? 0: this.amount.hashCode());
185-
result = 31 * result + (this.consitency == null ? 0: this.consitency.hashCode());
185+
result = 31 * result + (this.consistency == null ? 0: this.consistency.hashCode());
186186
result = 31 * result + (this.id == null ? 0: this.id.hashCode());
187187
result = 31 * result + (this.image == null ? 0: this.image.hashCode());
188188
result = 31 * result + (this.measures == null ? 0: this.measures.hashCode());
@@ -201,7 +201,7 @@ public String toString() {
201201

202202
sb.append(" aisle: ").append(aisle).append("\n");
203203
sb.append(" amount: ").append(amount).append("\n");
204-
sb.append(" consitency: ").append(consitency).append("\n");
204+
sb.append(" consistency: ").append(consistency).append("\n");
205205
sb.append(" id: ").append(id).append("\n");
206206
sb.append(" image: ").append(image).append("\n");
207207
sb.append(" measures: ").append(measures).append("\n");

angular/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.7.0-SNAPSHOT
1+
7.8.0-SNAPSHOT

angular/api/recipes.service.ts

Lines changed: 20 additions & 45 deletions
Large diffs are not rendered by default.

angular/model/getRecipeInformation200ResponseExtendedIngredientsInner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures } from
1515
export interface GetRecipeInformation200ResponseExtendedIngredientsInner {
1616
aisle: string;
1717
amount: number;
18-
consitency: string;
18+
consistency: string;
1919
id: number;
2020
image: string;
2121
measures?: GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures;

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser -F
33
# Setting environment variables
44
$env:PYTHON_POST_PROCESS_FILE = "yapf -i"
55
$VERSION = "1.1.2"
6-
$GEN = "openapi-generator-cli-7.7.0-SNAPSHOT.jar"
6+
$GEN = "openapi-generator-cli-7.8.0-SNAPSHOT.jar"
77
$SPEC = "spoonacular-openapi-3.json"
88

99
# Removing the 'python' directory

0 commit comments

Comments
 (0)