Skip to content

Commit a9c835b

Browse files
committed
gradle 8.0
1 parent 9bd1f25 commit a9c835b

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: set up JDK 1.11
12+
- name: set up JDK 1.17
1313
uses: actions/setup-java@v2
1414
with:
1515
distribution: 'temurin'
16-
java-version: '11'
16+
java-version: '17'
1717
- name: Build with Gradle
1818
run: ./gradlew assembleDebug

.idea/compiler.xml

+1-1
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.

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:7.4.2'
9+
classpath 'com.android.tools.build:gradle:8.0.2'
1010
}
1111
}
1212

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
android.enableJetifier=true
22
android.useAndroidX=true
3+
android.defaults.buildfeatures.buildconfig=true

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-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

jitpack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jdk:
2-
- openjdk11
2+
- openjdk17
33
install:
44
- ./gradlew :usbSerialForAndroid:publishToMavenLocal

usbSerialExamples/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ android {
2929
dependencies {
3030
implementation project(':usbSerialForAndroid')
3131
implementation 'androidx.appcompat:appcompat:1.6.1'
32-
implementation 'com.google.android.material:material:1.8.0'
32+
implementation 'com.google.android.material:material:1.9.0'
3333
}

usbSerialForAndroid/build.gradle

+12-13
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313

1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
testInstrumentationRunnerArguments = [ // Raspi Windows LinuxVM ...
16-
'rfc2217_server_host': '192.168.0.144',
16+
'rfc2217_server_host': '192.168.0.145',
1717
'rfc2217_server_nonstandard_baudrates': 'true', // true false false
1818
]
1919
}
@@ -22,39 +22,38 @@ android {
2222
targetCompatibility JavaVersion.VERSION_1_8
2323
}
2424
namespace 'com.hoho.android.usbserial'
25+
publishing {
26+
// if coverage is enabled, change 'release' to 'anyDeviceRelease' or comment out publishing rule
27+
singleVariant('release') {
28+
withSourcesJar()
29+
}
30+
}
2531
}
2632

2733
dependencies {
2834
implementation "androidx.annotation:annotation:1.5.0"
29-
//testImplementation 'androidx.test:core:1.5.0'
3035
testImplementation 'junit:junit:4.13.2'
31-
testImplementation 'org.mockito:mockito-core:1.10.19'
36+
testImplementation 'org.mockito:mockito-core:5.4.0'
3237
androidTestImplementation 'androidx.test:core:1.5.0'
3338
androidTestImplementation 'androidx.test:runner:1.5.2'
34-
androidTestImplementation 'commons-net:commons-net:3.8.0'
35-
androidTestImplementation 'org.apache.commons:commons-lang3:3.11'
39+
androidTestImplementation 'commons-net:commons-net:3.9.0'
40+
androidTestImplementation 'org.apache.commons:commons-lang3:3.12.0'
3641
}
3742

3843
// gradle task: publishToMavenLocal
3944
project.afterEvaluate {
4045
publishing {
4146
publications {
4247
release(MavenPublication) {
43-
from components.release // change 'release' to 'anyDeviceRelease' if coverage is enabled
44-
artifact androidSourcesJar
48+
from components.release
4549

4650
// values used for local maven repo, jitpack uses github release:
4751
groupId 'com.github.mik3y'
4852
artifactId 'usb-serial-for-android'
49-
version '3.5.0beta'
53+
version '3.5.2beta'
5054
}
5155
}
5256
}
5357
}
5458

55-
task androidSourcesJar(type: Jar) {
56-
classifier 'sources'
57-
from android.sourceSets.main.java.srcDirs
58-
}
59-
6059
//apply from: 'coverage.gradle'

0 commit comments

Comments
 (0)