Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build] upgrade to gradle 8.2.2 #245

Merged
merged 1 commit into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/android-app-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
android-api: [24]
android-abi: [x86, x86_64]
android-api: [24, 34]
android-abi: [x86_64]
os: [macos-12, ubuntu-20.04]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin' # Eclipse Temurin JDK
java-version: '17'
- name: Bootstrap
run: |
script/bootstrap.sh
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/android-app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin' # Eclipse Temurin JDK
java-version: '17'
- name: Check Release Version
id: check_release_version
run: |
Expand Down
15 changes: 12 additions & 3 deletions android/openthread_commissioner/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ task printVersionName {
}

android {
compileSdkVersion 30
buildToolsVersion "30.0.1"
compileSdkVersion 34

defaultConfig {
applicationId "io.openthread.commissioner.app"
minSdkVersion 24
targetSdkVersion 30
targetSdkVersion 34
versionCode 1
versionName "0.0.1"

Expand All @@ -73,6 +72,16 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'io.openthread.commissioner.app'
buildFeatures {
buildConfig true
}
}

configurations.all {
resolutionStrategy {
force 'androidx.test:core:1.5.0'
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.openthread.commissioner.app">

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
Expand All @@ -11,13 +9,13 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.OpenThreadCommissioner.NoActionBar">
android:theme="@style/Theme.OpenThreadCommissioner.NoActionBar"
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
2 changes: 1 addition & 1 deletion android/openthread_commissioner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:8.2.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 2 additions & 0 deletions android/openthread_commissioner/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat Oct 17 16:15:40 CST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Loading
Loading