pull/521/head
kai-morich 2023-07-04 20:46:36 +02:00
rodzic 9bd1f25773
commit a9c835bcb0
9 zmienionych plików z 21 dodań i 21 usunięć

Wyświetl plik

@ -9,10 +9,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: set up JDK 1.11
- name: set up JDK 1.17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- name: Build with Gradle
run: ./gradlew assembleDebug

Wyświetl plik

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="17" />
</component>
</project>

Wyświetl plik

@ -46,7 +46,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

Wyświetl plik

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.2'
}
}

Wyświetl plik

@ -1,2 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true

Wyświetl plik

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

Wyświetl plik

@ -1,4 +1,4 @@
jdk:
- openjdk11
- openjdk17
install:
- ./gradlew :usbSerialForAndroid:publishToMavenLocal

Wyświetl plik

@ -29,5 +29,5 @@ android {
dependencies {
implementation project(':usbSerialForAndroid')
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
}

Wyświetl plik

@ -13,7 +13,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments = [ // Raspi Windows LinuxVM ...
'rfc2217_server_host': '192.168.0.144',
'rfc2217_server_host': '192.168.0.145',
'rfc2217_server_nonstandard_baudrates': 'true', // true false false
]
}
@ -22,17 +22,22 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.hoho.android.usbserial'
publishing {
// if coverage is enabled, change 'release' to 'anyDeviceRelease' or comment out publishing rule
singleVariant('release') {
withSourcesJar()
}
}
}
dependencies {
implementation "androidx.annotation:annotation:1.5.0"
//testImplementation 'androidx.test:core:1.5.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:1.10.19'
testImplementation 'org.mockito:mockito-core:5.4.0'
androidTestImplementation 'androidx.test:core:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'commons-net:commons-net:3.8.0'
androidTestImplementation 'org.apache.commons:commons-lang3:3.11'
androidTestImplementation 'commons-net:commons-net:3.9.0'
androidTestImplementation 'org.apache.commons:commons-lang3:3.12.0'
}
// gradle task: publishToMavenLocal
@ -40,21 +45,15 @@ project.afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release // change 'release' to 'anyDeviceRelease' if coverage is enabled
artifact androidSourcesJar
from components.release
// values used for local maven repo, jitpack uses github release:
groupId 'com.github.mik3y'
artifactId 'usb-serial-for-android'
version '3.5.0beta'
version '3.5.2beta'
}
}
}
}
task androidSourcesJar(type: Jar) {
classifier 'sources'
from android.sourceSets.main.java.srcDirs
}
//apply from: 'coverage.gradle'