Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
使用jdk11编译代码
Browse files Browse the repository at this point in the history
  • Loading branch information
qwe7002 authored and qwe7002 committed Jul 14, 2021
1 parent 728d395 commit 1273fd8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .reall_network/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ release_apk:
- ghr -t "${GITHUB_ACCESS_KEY}" -u "${OWNER}" -r "${REPO}" -b "$(cat .reall_network/changelog.txt)" "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}-$(date "+%Y%m%d%H%M")" "./app/build/outputs/apk/release/app-release.apk"

build_release:
image: alvrme/alpine-android:android-30
image: alvrme/alpine-android:android-30-jdk11
stage: build
only:
- master
Expand Down
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.browser:browser:1.3.0'
implementation 'com.squareup.okio:okio:2.9.0'
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.0'
implementation 'org.conscrypt:conscrypt-android:2.5.1'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'io.paperdb:paperdb:2.7.1'
implementation 'com.squareup.okio:okio:3.0.0-alpha.6'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.0.0-alpha.2'
implementation 'org.conscrypt:conscrypt-android:2.5.2'
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'io.github.pilgr:paperdb:2.7.1'
implementation 'me.dm7.barcodescanner:zxing:1.9.13'
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31'
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10'
}

repositories {
Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,26 @@
buildscript {
repositories {
google()
mavenCentral()
//io.paperdb:paperdb Need this source
//noinspection JcenterRepositoryObsolete
jcenter()
mavenCentral()

}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-beta04'
classpath 'com.android.tools.build:gradle:7.0.0-beta05'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10"
}
}

allprojects {
repositories {
google()
mavenCentral()
//io.paperdb:paperdb Need this source
//noinspection JcenterRepositoryObsolete
jcenter()
mavenCentral()

}
}

Expand Down

0 comments on commit 1273fd8

Please sign in to comment.