Skip to content

Commit 11d4588

Browse files
TLabAltohTLabAltoh
committed
Revert IDE vertion to 2024.3.1.1 Koala
1 parent dc182bf commit 11d4588

6 files changed

Lines changed: 32 additions & 19 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ Registry:
1616
debugger.new.tool.window.layout=true
1717
ide.experimental.ui=true
1818
Non-Bundled Plugins:
19-
OpenGL-Plugin (1.1.3)
19+
OpenGL-Plugin (1.1.5)
2020
GLSL (1.24)
21-
name.kropp.intellij.makefile (241.14494.150)
2221
2322
OS: Windows 10
2423
```
2524

25+
> [!WARNING]
26+
> The latest version of Android Studio (`2024.3.1.14 Meerkat`) requires an update to `Gradle 8.*`, and plug-ins built with the latest version of Android Studio may not be able to be embedded in the current version of Unity (This project uses `Gradle 7.4`). Therefore, it is recommended to build with the Android Studio version specified in the Operating Environment (`2024.1.1 Koala`).
27+
2628
## Current Issue
2729
### Did not find frame
2830
- The following error occurs when using [```lockHardwareCanvas```](https://developer.android.com/reference/android/view/SurfaceHolder#lockHardwareCanvas()) in unity 2021

‎build.gradle‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.6.0' apply false
4-
id 'com.android.library' version '8.6.0' apply false
5-
// id 'com.android.application' version '7.3.1' apply false
6-
// id 'com.android.library' version '7.3.1' apply false
3+
// SDK 35
4+
// id 'com.android.application' version '8.6.1' apply false
5+
// id 'com.android.library' version '8.6.1' apply false
6+
7+
// SDK 34
8+
id 'com.android.application' version '7.3.1' apply false
9+
id 'com.android.library' version '7.3.1' apply false
710
}

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
2-
android.useAndroidX=true
2+
android.useAndroidX=true
3+
android.javaCompile.suppressSourceTargetDeprecationWarning=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#Sat Apr 26 16:31:39 JST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME

‎libTLabWebView/build.gradle‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ android {
88
//compileSdk 31
99
//compileSdk 32
1010
//compileSdk 33
11-
compileSdk 35
11+
compileSdk 34
12+
//compileSdk 35
1213
//buildToolsVersion "30.0.3"
1314

1415
defaultConfig {
@@ -18,7 +19,8 @@ android {
1819
//targetSdk 31
1920
//targetSdk 32
2021
//targetSdk 33
21-
targetSdk 35
22+
targetSdk 34
23+
//targetSdk 35
2224
versionCode 1
2325
versionName "1.0"
2426
consumerProguardFiles "consumer-rules.pro"
@@ -57,8 +59,8 @@ ext {
5759

5860
dependencies {
5961
compileOnly fileTree(dir: 'libs', include: 'classes.jar')
60-
implementation 'androidx.core:core:1.16.0'
61-
//implementation 'androidx.core:core:1.15.0'
62+
//implementation 'androidx.core:core:1.16.0' // SDK 35
63+
implementation 'androidx.core:core:1.15.0' // SDK 34
6264
implementation 'androidx.annotation:annotation-jvm:1.9.1'
6365
implementation "org.mozilla.geckoview:geckoview${geckoviewChannel}:${geckoviewVersion}"
6466
//implementation "org.mozilla.geckoview:geckoview${geckoviewChannel}-armeabi-v7a:${geckoviewVersion}"
@@ -68,4 +70,12 @@ dependencies {
6870
android.libraryVariants.configureEach { variant ->
6971
variant.outputs.each { output -> output.packageLibrary.exclude('libs/classes.jar')
7072
}
71-
}
73+
}
74+
75+
//gradle.projectsEvaluated {
76+
// tasks.withType(JavaCompile).tap {
77+
// configureEach {
78+
// options.compilerArgs << "-Xlint:deprecation"
79+
// }
80+
// }
81+
//}

‎libTLabWebView/src/main/java/com/tlab/webkit/chromium/UnityConnect.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError e
297297
// https://github.com/TLabAltoh/TLabWebViewVR/issues/35
298298
// https://github.com/TLabAltoh/TLabWebView/issues/8
299299

300-
//handler.cancel();
300+
// handler.cancel();
301301

302302
// ----------------------------------------------------------------------------------------
303303
}
@@ -596,11 +596,7 @@ public void EvaluateJS(String js) {
596596
final Activity a = UnityPlayer.currentActivity;
597597
a.runOnUiThread(() -> {
598598
if (mWebView == null || !mWebView.getSettings().getJavaScriptEnabled()) return;
599-
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
600-
mWebView.evaluateJavascript("(function(){" + js + "})();", null);
601-
} else {
602-
mWebView.loadUrl("javascript:(function(){" + js + "})();");
603-
}
599+
mWebView.evaluateJavascript("(function(){" + js + "})();", null);
604600
});
605601
}
606602

0 commit comments

Comments
 (0)