Skip to content

Commit

Permalink
AGP upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
wysaid committed Dec 15, 2024
1 parent e1bb223 commit 9d9f601
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
ndk-version: r26d
link-to-sdk: true
add-to-path: true
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: gradle
- name: Grant execute permission for gradlew
Expand All @@ -46,4 +46,4 @@ jobs:
demoRelease/cgeDemo.apk
compression-level: 0
retention-days: 15
if-no-files-found: error
if-no-files-found: error
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ org.gradle.jvmargs+=-Dfile.encoding=UTF-8

android.useAndroidX=true
android.enableJetifier=true
android.injected.testOnly=false
android.injected.testOnly=false
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jan 05 14:44:46 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ if (deployArtifacts()) {
version = version

afterEvaluate {
from components.release
from components.findByName('release')
// artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
}

Expand Down Expand Up @@ -181,7 +181,7 @@ if (deployArtifacts()) {

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
archiveClassifier.set('sources')
}

task javadoc(type: Javadoc) {
Expand All @@ -190,7 +190,7 @@ if (deployArtifacts()) {
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier.set('javadoc')
from javadoc.destinationDir
}

Expand Down

0 comments on commit 9d9f601

Please sign in to comment.