Compare commits
25 Commits
v.1.5.7_an
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
90af1ffd08 | ||
|
|
405413a212 | ||
|
|
9488ff2513 | ||
|
|
2a42432a18 | ||
|
|
874e4f85fc | ||
|
|
62c2e9cfc3 | ||
|
|
49bafa2fac | ||
|
|
7739b7d291 | ||
|
|
f0f4c639c0 | ||
|
|
b6d20fe9cd | ||
|
|
f7a4d2aa47 | ||
|
|
f3cac19afe | ||
|
|
8538803485 | ||
|
|
be63ed686d | ||
|
|
67e9e2606f | ||
|
|
7a015b49c0 | ||
|
|
8910eb7a9a | ||
|
|
7736db2fd8 | ||
|
|
f7e06bbbb0 | ||
|
|
9c606c912c | ||
|
|
b29592f4ba | ||
|
|
93870ca319 | ||
|
|
10a8fb1bd4 | ||
|
|
f0a42fe98e | ||
|
|
3cb8082e95 |
@ -13,8 +13,8 @@ namespace BFEditor.Build
|
||||
|
||||
public class BuildProjectWindow : EditorWindow
|
||||
{
|
||||
private static int versionCode = 17;
|
||||
private static string versionName = "1.5.7";
|
||||
private static int versionCode = 18;
|
||||
private static string versionName = "1.6.5";
|
||||
BFPlatformOptions platform = BFPlatformOptions.AndroidDev;
|
||||
const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android";
|
||||
const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android";
|
||||
|
||||
@ -620,12 +620,6 @@ namespace BFEditor.Build
|
||||
|
||||
var buildGradlePath = Path.Combine(PublishAsProjectPath, "launcher/build.gradle");
|
||||
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\"]");
|
||||
if (!regex2.IsMatch(buildGradleText))
|
||||
{
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -7,7 +7,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.0.1'
|
||||
classpath 'com.android.tools.build:gradle:7.1.3'
|
||||
classpath 'com.google.gms:google-services:4.3.13'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
org.gradle.jvmargs=-Xmx4096M
|
||||
org.gradle.parallel=true
|
||||
android.enableR8=false
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
unityStreamingAssets=.unity3d, .bytes, .ab, UnityServicesProjectConfiguration.json
|
||||
@ -16,10 +16,10 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
compileSdkVersion 33
|
||||
compileSdkVersion 34
|
||||
buildToolsVersion '30.0.2'
|
||||
defaultConfig {
|
||||
targetSdkVersion 33
|
||||
targetSdkVersion 34
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
|
||||
@ -50,7 +50,7 @@ dependencies {
|
||||
implementation(name: 'UnityUtils-release', 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.android.billingclient:billing:5.0.0"
|
||||
implementation "com.android.billingclient:billing:6.2.1"
|
||||
|
||||
// firebase
|
||||
implementation 'com.google.firebase:firebase-analytics:21.1.0'
|
||||
@ -119,17 +119,17 @@ dependencies {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 33
|
||||
compileSdkVersion 34
|
||||
buildToolsVersion '30.0.2'
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 33
|
||||
minSdkVersion 24
|
||||
targetSdkVersion 34
|
||||
ndk {
|
||||
abiFilters 'armeabi-v7a', 'arm64-v8a'
|
||||
}
|
||||
|
||||
@ -10,17 +10,17 @@ dependencies {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 33
|
||||
compileSdkVersion 34
|
||||
buildToolsVersion '30.0.2'
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 33
|
||||
minSdkVersion 24
|
||||
targetSdkVersion 34
|
||||
applicationId 'REPLACE_APPLICATION_ID'
|
||||
ndk {
|
||||
abiFilters 'armeabi-v7a', 'arm64-v8a'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user