Skip to content

Commit de196c4

Browse files
committed
⚡ [CORE] Update: Gradle and Android version
1 parent ff2012e commit de196c4

File tree

12 files changed

+18
-30
lines changed

12 files changed

+18
-30
lines changed

.idea/gradle.xml

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

-12
This file was deleted.

app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 30
5-
buildToolsVersion "30.0.1"
4+
compileSdkVersion 33
5+
// buildToolsVersion "30.0.1"
66
defaultConfig {
77
applicationId "com.android.js.webview"
88
minSdkVersion 19
9-
targetSdkVersion 30
9+
targetSdkVersion 33
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -43,14 +43,14 @@ android {
4343
}
4444

4545
dependencies {
46-
implementation fileTree(include: ['*.jar'], dir: 'libs')
47-
implementation project(path: ':androidjs-release')
46+
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
4847
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
4948
exclude group: 'com.android.support', module: 'support-annotations'
5049
})
5150
//noinspection GradleCompatible
5251
implementation 'com.android.support:appcompat-v7:28.0.0'
5352
implementation 'com.android.support.constraint:constraint-layout:2.0.2'
5453
testImplementation 'junit:junit:4.12'
54+
releaseImplementation files('libs/androidjs-release.aar')
5555
// implementation 'com.android.js:androidjs:2.0.0'
5656
}

app/libs/androidjs-release.aar

57.6 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
android:roundIcon="@mipmap/ic_launcher_round"
3131
android:supportsRtl="true"
3232
android:theme="@style/AppTheme">
33-
<activity android:name="com.android.js.webview.MainActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" >
33+
<activity android:name="com.android.js.webview.MainActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
34+
android:exported="true">
3435
<intent-filter>
3536
<action android:name="android.intent.action.MAIN" />
3637

app/src/main/assets/myapp/assets/ipc/androidjs.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/assets/myapp/views/index.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="format-detection" content="telephone=no" />
66
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
77

8-
<link rel="stylesheet" href="dist/css/phonon.css" />
8+
<!-- <link rel="stylesheet" href="dist/css/phonon.css" />-->
99
<script src = "../assets/ipc/androidjs.js"></script>
1010
<title>App</title>
1111
</head>
@@ -58,6 +58,7 @@ <h1 class="title">Phonon Example</h1>
5858
<script>
5959

6060
console.log("Hello this is from webview");
61+
console.log(app.setDefaultFontSize(10));
6162

6263
//location.href = "http://localhost:4001";
6364
//setTimeout(function(){

app/src/main/java/com/android/js/webview/MainActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Environment;
44
import android.os.Bundle;
5+
import android.webkit.WebSettings;
56
import android.webkit.WebView;
67

78
import com.android.js.other.PermissionRequest;

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.4.0'
9+
classpath 'com.android.tools.build:gradle:7.3.0'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri May 10 19:10:39 IST 2019
1+
#Wed Oct 12 19:03:25 IST 2022
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
include ':androidjs-release'
21
include ':app'

0 commit comments

Comments
 (0)