Compare commits

..

No commits in common. "master" and "v.1.5.8_android" have entirely different histories.

17 changed files with 294 additions and 507 deletions

View File

@ -13,8 +13,8 @@ namespace BFEditor.Build
public class BuildProjectWindow : EditorWindow public class BuildProjectWindow : EditorWindow
{ {
private static int versionCode = 18; private static int versionCode = 17;
private static string versionName = "1.6.5"; private static string versionName = "1.5.8";
BFPlatformOptions platform = BFPlatformOptions.AndroidDev; BFPlatformOptions platform = BFPlatformOptions.AndroidDev;
const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android"; const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android";
const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android"; const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android";

View File

@ -620,6 +620,12 @@ namespace BFEditor.Build
var buildGradlePath = Path.Combine(PublishAsProjectPath, "launcher/build.gradle"); var buildGradlePath = Path.Combine(PublishAsProjectPath, "launcher/build.gradle");
var buildGradleText = File.ReadAllText(buildGradlePath); var buildGradleText = File.ReadAllText(buildGradlePath);
var regex1 = new Regex("implementation 'com.google.android.play:core:1.10.0'");
if (!regex1.IsMatch(buildGradleText))
{
var regex12 = new Regex("dependencies {");
buildGradleText = regex12.Replace(buildGradleText, "dependencies {\n implementation 'com.google.android.play:core:1.10.0'");
}
var regex2 = new Regex("assetPacks = [\":install_time_pack\"]"); var regex2 = new Regex("assetPacks = [\":install_time_pack\"]");
if (!regex2.IsMatch(buildGradleText)) if (!regex2.IsMatch(buildGradleText))
{ {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,7 +7,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.3' classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.13' classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
} }

View File

@ -1,5 +1,6 @@
org.gradle.jvmargs=-Xmx4096M org.gradle.jvmargs=-Xmx4096M
org.gradle.parallel=true org.gradle.parallel=true
android.enableR8=false
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
unityStreamingAssets=.unity3d, .bytes, .ab, UnityServicesProjectConfiguration.json unityStreamingAssets=.unity3d, .bytes, .ab, UnityServicesProjectConfiguration.json

View File

@ -16,10 +16,10 @@ android {
} }
} }
compileSdkVersion 34 compileSdkVersion 33
buildToolsVersion '30.0.2' buildToolsVersion '30.0.2'
defaultConfig { defaultConfig {
targetSdkVersion 34 targetSdkVersion 33
} }
lintOptions { lintOptions {

View File

@ -50,7 +50,7 @@ dependencies {
implementation(name: 'UnityUtils-release', ext:'aar') implementation(name: 'UnityUtils-release', ext:'aar')
implementation(name: 'facebook-android-wrapper-15.1.0', ext:'aar') implementation(name: 'facebook-android-wrapper-15.1.0', ext:'aar')
implementation 'com.google.android.gms:play-services-auth:20.1.0' implementation 'com.google.android.gms:play-services-auth:20.1.0'
implementation "com.android.billingclient:billing:6.2.1" implementation "com.android.billingclient:billing:5.0.0"
// firebase // firebase
implementation 'com.google.firebase:firebase-analytics:21.1.0' implementation 'com.google.firebase:firebase-analytics:21.1.0'
@ -119,17 +119,17 @@ dependencies {
} }
android { android {
compileSdkVersion 34 compileSdkVersion 33
buildToolsVersion '30.0.2' buildToolsVersion '30.0.2'
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_1_8
} }
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 33
ndk { ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a' abiFilters 'armeabi-v7a', 'arm64-v8a'
} }

View File

@ -10,17 +10,17 @@ dependencies {
} }
android { android {
compileSdkVersion 34 compileSdkVersion 33
buildToolsVersion '30.0.2' buildToolsVersion '30.0.2'
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_1_8
} }
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 19
targetSdkVersion 34 targetSdkVersion 33
applicationId 'REPLACE_APPLICATION_ID' applicationId 'REPLACE_APPLICATION_ID'
ndk { ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a' abiFilters 'armeabi-v7a', 'arm64-v8a'