Skip to content

Commit

Permalink
Merge pull request #25 from valpackett/master
Browse files Browse the repository at this point in the history
lua/elixir build fixes
  • Loading branch information
ddsky authored Jul 15, 2024
2 parents ec7086d + 5309300 commit a23a5cc
Showing 1,132 changed files with 3,066 additions and 3,951 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -218,5 +218,4 @@ jobs:
- name: Check lua
working-directory: ./lua
run: |
luarocks install ./*.rockspec --check-lua-versions
luarocks test
luarocks make ./*.rockspec --check-lua-versions
2 changes: 1 addition & 1 deletion android/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.7.0-SNAPSHOT
7.8.0-SNAPSHOT
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**aisle** | **String** | |
**amount** | [**BigDecimal**](BigDecimal.md) | |
**consitency** | **String** | |
**consistency** | **String** | |
**id** | **Integer** | |
**image** | **String** | |
**measures** | [**GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures**](GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures.md) | | [optional]
30 changes: 10 additions & 20 deletions android/docs/RecipesApi.md

Large diffs are not rendered by default.

45 changes: 15 additions & 30 deletions android/src/main/java/com/spoonacular/RecipesApi.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ public class GetRecipeInformation200ResponseExtendedIngredientsInner {
private String aisle = null;
@SerializedName("amount")
private BigDecimal amount = null;
@SerializedName("consitency")
private String consitency = null;
@SerializedName("consistency")
private String consistency = null;
@SerializedName("id")
private Integer id = null;
@SerializedName("image")
@@ -67,11 +67,11 @@ public void setAmount(BigDecimal amount) {
/**
**/
@ApiModelProperty(required = true, value = "")
public String getConsitency() {
return consitency;
public String getConsistency() {
return consistency;
}
public void setConsitency(String consitency) {
this.consitency = consitency;
public void setConsistency(String consistency) {
this.consistency = consistency;
}

/**
@@ -166,7 +166,7 @@ public boolean equals(Object o) {
GetRecipeInformation200ResponseExtendedIngredientsInner getRecipeInformation200ResponseExtendedIngredientsInner = (GetRecipeInformation200ResponseExtendedIngredientsInner) o;
return (this.aisle == null ? getRecipeInformation200ResponseExtendedIngredientsInner.aisle == null : this.aisle.equals(getRecipeInformation200ResponseExtendedIngredientsInner.aisle)) &&
(this.amount == null ? getRecipeInformation200ResponseExtendedIngredientsInner.amount == null : this.amount.equals(getRecipeInformation200ResponseExtendedIngredientsInner.amount)) &&
(this.consitency == null ? getRecipeInformation200ResponseExtendedIngredientsInner.consitency == null : this.consitency.equals(getRecipeInformation200ResponseExtendedIngredientsInner.consitency)) &&
(this.consistency == null ? getRecipeInformation200ResponseExtendedIngredientsInner.consistency == null : this.consistency.equals(getRecipeInformation200ResponseExtendedIngredientsInner.consistency)) &&
(this.id == null ? getRecipeInformation200ResponseExtendedIngredientsInner.id == null : this.id.equals(getRecipeInformation200ResponseExtendedIngredientsInner.id)) &&
(this.image == null ? getRecipeInformation200ResponseExtendedIngredientsInner.image == null : this.image.equals(getRecipeInformation200ResponseExtendedIngredientsInner.image)) &&
(this.measures == null ? getRecipeInformation200ResponseExtendedIngredientsInner.measures == null : this.measures.equals(getRecipeInformation200ResponseExtendedIngredientsInner.measures)) &&
@@ -182,7 +182,7 @@ public int hashCode() {
int result = 17;
result = 31 * result + (this.aisle == null ? 0: this.aisle.hashCode());
result = 31 * result + (this.amount == null ? 0: this.amount.hashCode());
result = 31 * result + (this.consitency == null ? 0: this.consitency.hashCode());
result = 31 * result + (this.consistency == null ? 0: this.consistency.hashCode());
result = 31 * result + (this.id == null ? 0: this.id.hashCode());
result = 31 * result + (this.image == null ? 0: this.image.hashCode());
result = 31 * result + (this.measures == null ? 0: this.measures.hashCode());
@@ -201,7 +201,7 @@ public String toString() {

sb.append(" aisle: ").append(aisle).append("\n");
sb.append(" amount: ").append(amount).append("\n");
sb.append(" consitency: ").append(consitency).append("\n");
sb.append(" consistency: ").append(consistency).append("\n");
sb.append(" id: ").append(id).append("\n");
sb.append(" image: ").append(image).append("\n");
sb.append(" measures: ").append(measures).append("\n");
2 changes: 1 addition & 1 deletion angular/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.7.0-SNAPSHOT
7.8.0-SNAPSHOT
65 changes: 20 additions & 45 deletions angular/api/recipes.service.ts

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import { GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures } from
export interface GetRecipeInformation200ResponseExtendedIngredientsInner {
aisle: string;
amount: number;
consitency: string;
consistency: string;
id: number;
image: string;
measures?: GetRecipeInformation200ResponseExtendedIngredientsInnerMeasures;
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser -F
# Setting environment variables
$env:PYTHON_POST_PROCESS_FILE = "yapf -i"
$VERSION = "1.1.2"
$GEN = "openapi-generator-cli-7.7.0-SNAPSHOT.jar"
$GEN = "openapi-generator-cli-7.8.0-SNAPSHOT.jar"
$SPEC = "spoonacular-openapi-3.json"

# Removing the 'python' directory
2 changes: 1 addition & 1 deletion clojure/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.7.0-SNAPSHOT
7.8.0-SNAPSHOT
20 changes: 10 additions & 10 deletions clojure/src/spoonacular_api/api/recipes.clj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
{
(ds/req :aisle) string?
(ds/req :amount) float?
(ds/req :consitency) string?
(ds/req :consistency) string?
(ds/req :id) int?
(ds/req :image) string?
(ds/opt :measures) get-recipe-information-200-response-extended-ingredients-inner-measures-spec
2 changes: 1 addition & 1 deletion cpp/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.7.0-SNAPSHOT
7.8.0-SNAPSHOT
2 changes: 1 addition & 1 deletion cpp/README.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
spoonacular API

- API version: 1.1
- Generator version: 7.7.0-SNAPSHOT
- Generator version: 7.8.0-SNAPSHOT

The spoonacular Nutrition, Recipe, and Food API allows you to access over thousands of recipes, thousands of ingredients, 800,000 food products, over 100,000 menu items, and restaurants. Our food ontology and semantic recipe search engine makes it possible to search for recipes using natural language queries, such as \"gluten free brownies without sugar\" or \"low fat vegan cupcakes.\" You can automatically calculate the nutritional information for any recipe, analyze recipe costs, visualize ingredient lists, find recipes for what's in your fridge, find recipes based on special diets, nutritional requirements, or favorite ingredients, classify recipes into types and cuisines, convert ingredient amounts, or even compute an entire meal plan. With our powerful API, you can create many kinds of food and especially nutrition apps.

Original file line number Diff line number Diff line change
@@ -40,8 +40,8 @@ void OAIGetRecipeInformation_200_response_extendedIngredients_inner::initializeM
m_amount_isSet = false;
m_amount_isValid = false;

m_consitency_isSet = false;
m_consitency_isValid = false;
m_consistency_isSet = false;
m_consistency_isValid = false;

m_id_isSet = false;
m_id_isValid = false;
@@ -83,8 +83,8 @@ void OAIGetRecipeInformation_200_response_extendedIngredients_inner::fromJsonObj
m_amount_isValid = ::OpenAPI::fromJsonValue(m_amount, json[QString("amount")]);
m_amount_isSet = !json[QString("amount")].isNull() && m_amount_isValid;

m_consitency_isValid = ::OpenAPI::fromJsonValue(m_consitency, json[QString("consitency")]);
m_consitency_isSet = !json[QString("consitency")].isNull() && m_consitency_isValid;
m_consistency_isValid = ::OpenAPI::fromJsonValue(m_consistency, json[QString("consistency")]);
m_consistency_isSet = !json[QString("consistency")].isNull() && m_consistency_isValid;

m_id_isValid = ::OpenAPI::fromJsonValue(m_id, json[QString("id")]);
m_id_isSet = !json[QString("id")].isNull() && m_id_isValid;
@@ -126,8 +126,8 @@ QJsonObject OAIGetRecipeInformation_200_response_extendedIngredients_inner::asJs
if (m_amount_isSet) {
obj.insert(QString("amount"), ::OpenAPI::toJsonValue(m_amount));
}
if (m_consitency_isSet) {
obj.insert(QString("consitency"), ::OpenAPI::toJsonValue(m_consitency));
if (m_consistency_isSet) {
obj.insert(QString("consistency"), ::OpenAPI::toJsonValue(m_consistency));
}
if (m_id_isSet) {
obj.insert(QString("id"), ::OpenAPI::toJsonValue(m_id));
@@ -188,20 +188,20 @@ bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::is_amount_V
return m_amount_isValid;
}

QString OAIGetRecipeInformation_200_response_extendedIngredients_inner::getConsitency() const {
return m_consitency;
QString OAIGetRecipeInformation_200_response_extendedIngredients_inner::getConsistency() const {
return m_consistency;
}
void OAIGetRecipeInformation_200_response_extendedIngredients_inner::setConsitency(const QString &consitency) {
m_consitency = consitency;
m_consitency_isSet = true;
void OAIGetRecipeInformation_200_response_extendedIngredients_inner::setConsistency(const QString &consistency) {
m_consistency = consistency;
m_consistency_isSet = true;
}

bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::is_consitency_Set() const{
return m_consitency_isSet;
bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::is_consistency_Set() const{
return m_consistency_isSet;
}

bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::is_consitency_Valid() const{
return m_consitency_isValid;
bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::is_consistency_Valid() const{
return m_consistency_isValid;
}

qint32 OAIGetRecipeInformation_200_response_extendedIngredients_inner::getId() const {
@@ -345,7 +345,7 @@ bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::isSet() con
break;
}

if (m_consitency_isSet) {
if (m_consistency_isSet) {
isObjectUpdated = true;
break;
}
@@ -395,7 +395,7 @@ bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::isSet() con

bool OAIGetRecipeInformation_200_response_extendedIngredients_inner::isValid() const {
// only required properties are required for the object to be considered valid
return m_aisle_isValid && m_amount_isValid && m_consitency_isValid && m_id_isValid && m_image_isValid && m_name_isValid && m_original_isValid && m_original_name_isValid && m_unit_isValid && true;
return m_aisle_isValid && m_amount_isValid && m_consistency_isValid && m_id_isValid && m_image_isValid && m_name_isValid && m_original_isValid && m_original_name_isValid && m_unit_isValid && true;
}

} // namespace OpenAPI
Original file line number Diff line number Diff line change
@@ -52,10 +52,10 @@ class OAIGetRecipeInformation_200_response_extendedIngredients_inner : public OA
bool is_amount_Set() const;
bool is_amount_Valid() const;

QString getConsitency() const;
void setConsitency(const QString &consitency);
bool is_consitency_Set() const;
bool is_consitency_Valid() const;
QString getConsistency() const;
void setConsistency(const QString &consistency);
bool is_consistency_Set() const;
bool is_consistency_Valid() const;

qint32 getId() const;
void setId(const qint32 &id);
@@ -111,9 +111,9 @@ class OAIGetRecipeInformation_200_response_extendedIngredients_inner : public OA
bool m_amount_isSet;
bool m_amount_isValid;

QString m_consitency;
bool m_consitency_isSet;
bool m_consitency_isValid;
QString m_consistency;
bool m_consistency_isSet;
bool m_consistency_isValid;

qint32 m_id;
bool m_id_isSet;
Loading

0 comments on commit a23a5cc

Please sign in to comment.