Fixed the build cache failing for iOS
This commit is contained in:
@@ -134,7 +134,8 @@ class AdMobUtil
|
||||
}
|
||||
#end
|
||||
|
||||
Admob.showBanner([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.ADMOB_BANNER_AD_UNIT_ID].join('/'), size, align);
|
||||
if (AdMobUtil.ADMOB_PUBLISHER != null && AdMobUtil.BANNER_AD_UNIT_ID != null)
|
||||
Admob.showBanner([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.BANNER_AD_UNIT_ID].join('/'), size, align);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -186,7 +187,10 @@ class AdMobUtil
|
||||
|
||||
Admob.onEvent.add(interstitialEvent);
|
||||
|
||||
Admob.loadInterstitial([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.ADMOB_INTERSTITIAL_AD_UNIT_ID].join('/'));
|
||||
if (AdMobUtil.ADMOB_PUBLISHER != null && AdMobUtil.INTERSTITIAL_AD_UNIT_ID != null)
|
||||
{
|
||||
Admob.loadInterstitial([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.ADMOB_INTERSTITIAL_AD_UNIT_ID].join('/'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -40,7 +40,13 @@ class CreditsDataMacro
|
||||
#if macro
|
||||
static function fetchJSON():Null<String>
|
||||
{
|
||||
return sys.io.File.getContent(#if ios '../../../../../' + #end CreditsDataHandler.CREDITS_DATA_PATH);
|
||||
var creditsPath:String = CreditsDataHandler.CREDITS_DATA_PATH;
|
||||
|
||||
#if ios
|
||||
if (!sys.FileSystem.exists(creditsPath)) creditsPath = "../../../../../" + creditsPath;
|
||||
#end
|
||||
|
||||
return sys.io.File.getContent(creditsPath);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,7 +23,7 @@ class EnvironmentMacro
|
||||
*/
|
||||
public static macro function build():Array<Field>
|
||||
{
|
||||
final envFile:Map<String, String> = parseEnvFile(#if ios '../../../../../.env' #else '.env' #end);
|
||||
final envFile:Map<String, String> = parseEnvFile('.env');
|
||||
|
||||
final buildFields:Array<Field> = Context.getBuildFields();
|
||||
|
||||
@@ -95,6 +95,10 @@ class EnvironmentMacro
|
||||
{
|
||||
final env:Map<String, String> = [];
|
||||
|
||||
#if ios
|
||||
if (!FileSystem.exists(envPath)) envPath = "../../../../../" + envPath;
|
||||
#end
|
||||
|
||||
if (FileSystem.exists(envPath))
|
||||
{
|
||||
final envContent:Null<String> = File.getContent(envPath);
|
||||
|
||||
@@ -23,7 +23,14 @@ class HaxelibVersions
|
||||
{
|
||||
var result:Array<String> = [];
|
||||
|
||||
var hmmData:Dynamic = haxe.Json.parse(sys.io.File.getContent(#if ios '../../../../../' + #end 'hmm.json'));
|
||||
var hmmFile:String = "hmm.json";
|
||||
|
||||
#if ios
|
||||
if (!sys.FileSystem.exists(hmmFile)) hmmFile = "../../../../../" + hmmFile;
|
||||
#end
|
||||
|
||||
var hmmData:Dynamic = haxe.Json.parse(sys.io.File.getContent(hmmFile));
|
||||
|
||||
var dependencies:Array<Dynamic> = cast hmmData.dependencies;
|
||||
for (library in dependencies)
|
||||
{
|
||||
|
||||
@@ -38,11 +38,7 @@ typedef RegistryTypeParams =
|
||||
*/
|
||||
class RegistryMacro
|
||||
{
|
||||
#if ios
|
||||
static final DATA_FILE_BASE_PATH:String = "../../../../../assets/preload/data";
|
||||
#else
|
||||
static final DATA_FILE_BASE_PATH:String = "assets/preload/data";
|
||||
#end
|
||||
|
||||
/**
|
||||
* Builds the registry class.
|
||||
@@ -147,7 +143,13 @@ class RegistryMacro
|
||||
var newJsonParser:String = 'new json2object.JsonParser<${dataType.module}.${dataType.name}>()';
|
||||
|
||||
var dataFilePath:String = getRegistryDataFilePath(cls, fields);
|
||||
var baseGameEntryIds:Array<Expr> = listBaseGameEntryIds('${DATA_FILE_BASE_PATH}/${dataFilePath}/');
|
||||
|
||||
#if ios
|
||||
var dataPath:String = DATA_FILE_BASE_PATH;
|
||||
if (!sys.FileSystem.exists(dataPath)) dataPath = "../../../../../" + dataPath;
|
||||
#end
|
||||
|
||||
var baseGameEntryIds:Array<Expr> = listBaseGameEntryIds('${dataPath}/${dataFilePath}/');
|
||||
|
||||
return (macro class TempClass
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user