Skip to content

Commit 6c16b57

Browse files
committed
Upgrade gradle plugin
1 parent f978687 commit 6c16b57

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
lines changed

android-test/build.gradle

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

2424
android {
25-
compileSdkVersion 30
25+
compileSdkVersion 31
2626

2727
defaultConfig {
2828
applicationId 'com.hippo.quickjs.test.android'
2929
minSdkVersion 18
30-
targetSdkVersion 30
30+
targetSdkVersion 31
3131
versionCode 1
3232
versionName '1.0'
3333
externalNativeBuild {
@@ -125,9 +125,9 @@ project.afterEvaluate {
125125

126126
dependencies {
127127
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
128-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
129-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
130-
implementation 'androidx.core:core:1.3.1'
128+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
129+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
130+
implementation 'androidx.core:core-ktx:1.7.0'
131131
implementation 'net.lingala.zip4j:zip4j:1.3.2'
132132
implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
133133
}

android-test/src/main/AndroidManifest.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
android:label="quickjs android test"
2727
tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">
2828

29-
<activity android:name="com.hippo.quickjs.android.test.TestActivity">
29+
<activity
30+
android:name="com.hippo.quickjs.android.test.TestActivity"
31+
android:exported="true">
3032
<intent-filter>
3133
<action android:name="android.intent.action.MAIN"/>
3234
<category android:name="android.intent.category.LAUNCHER"/>

build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
buildscript {
1818
repositories {
1919
google()
20+
mavenCentral()
21+
//noinspection JcenterRepositoryObsolete
2022
jcenter()
23+
maven { url 'https://plugins.gradle.org/m2/' }
2124
}
2225
dependencies {
23-
classpath 'com.android.tools.build:gradle:4.1.1'
26+
classpath 'com.android.tools.build:gradle:7.0.3'
2427
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2528
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
2629
classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.0'
@@ -30,6 +33,8 @@ buildscript {
3033
allprojects {
3134
repositories {
3235
google()
36+
mavenCentral()
37+
//noinspection JcenterRepositoryObsolete
3338
jcenter()
3439
maven { url 'https://jitpack.io' }
3540
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ android.enableJetifier=true
3636
# Kotlin code style for this project: "official" or "obsolete":
3737
kotlin.code.style=official
3838

39-
kotlin_version=1.4.21
39+
kotlin_version=1.5.31

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

library/build.gradle

+6-8
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
apply plugin: 'com.android.library'
1818

1919
android {
20-
compileSdkVersion 30
20+
compileSdkVersion 31
2121

2222
defaultConfig {
2323
minSdkVersion 18
24-
targetSdkVersion 30
25-
versionCode 1
26-
versionName '1.0'
24+
targetSdkVersion 31
2725
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2826
externalNativeBuild {
2927
cmake {
@@ -57,9 +55,9 @@ android {
5755
}
5856

5957
dependencies {
60-
implementation 'androidx.annotation:annotation:1.1.0'
61-
androidTestImplementation 'androidx.test:core:1.3.0'
62-
androidTestImplementation 'androidx.test:runner:1.3.0'
63-
androidTestImplementation 'junit:junit:4.12'
58+
implementation 'androidx.annotation:annotation:1.3.0'
59+
androidTestImplementation 'androidx.test:core:1.4.0'
60+
androidTestImplementation 'androidx.test:runner:1.4.0'
61+
androidTestImplementation 'junit:junit:4.13.2'
6462
androidTestImplementation 'org.assertj:assertj-core:3.13.2'
6563
}

0 commit comments

Comments
 (0)