vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-25 21:42:07 +01:00
Code Issues Releases Wiki Activity

Merge pull request #634 from Flowdalic/rename-java8-to-java11

Browse source 
Rename smack-java8(-full) to smack-java11(-full)
This commit is contained in:
Florian Schmaus 2024-09-25 13:29:59 +00:00 committed by GitHub
commit 55400633c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -95,8 +95,8 @@ jobs:
else else
echo COVERALLS_REPO_TOKEN is not empty echo COVERALLS_REPO_TOKEN is not empty
fi fi
./gradlew smack-java8-full:testCodeCoverageReport ./gradlew smack-java11-full:testCodeCoverageReport
./gradlew smack-java8-full:coveralls ./gradlew smack-java11-full:coveralls
# Upload build artifacts # Upload build artifacts
- name: Upload build artifacts - name: Upload build artifacts

4
Makefile
View file

@ -5,8 +5,8 @@ all: check jacocoRootReport javadocAll sinttest
.PHONY: codecov .PHONY: codecov
codecov: codecov:
$(GRADLE) smack-java8-full:testCodeCoverageReport $(GRADLE) smack-java11-full:testCodeCoverageReport
echo "Report available at smack-java8-full/build/reports/jacoco/testCodeCoverageReport/html/index.html" echo "Report available at smack-java11-full/build/reports/jacoco/testCodeCoverageReport/html/index.html"
.PHONY: check .PHONY: check
check: check:

4
settings.gradle
View file

@ -27,8 +27,8 @@ include 'smack-core',
'smack-bosh', 'smack-bosh',
'smack-android', 'smack-android',
'smack-android-extensions', 'smack-android-extensions',
'smack-java8', 'smack-java11',
'smack-java8-full', 'smack-java11-full',
'smack-integration-test', 'smack-integration-test',
'smack-omemo', 'smack-omemo',
'smack-omemo-signal', 'smack-omemo-signal',

2
smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java

2
smack-android/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java

2
smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java

2
smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java

2
smack-integration-test/build.gradle
View file

@ -12,7 +12,7 @@ application {
} }
dependencies { dependencies {
api project(':smack-java8-full') api project(':smack-java11-full')
api project(':smack-resolver-dnsjava') api project(':smack-resolver-dnsjava')
implementation project(':smack-websocket-java11') implementation project(':smack-websocket-java11')
implementation "com.google.guava:guava:${guavaVersion}" implementation "com.google.guava:guava:${guavaVersion}"

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java

2
smack-java8-full/build.gradle → smack-java11-full/build.gradle
View file

@ -10,7 +10,7 @@ dependencies {
api project(':smack-debug') api project(':smack-debug')
api project(':smack-experimental') api project(':smack-experimental')
api project(':smack-extensions') api project(':smack-extensions')
api project(':smack-java8') api project(':smack-java11')
api project(':smack-legacy') api project(':smack-legacy')
api project(':smack-omemo') api project(':smack-omemo')
api project(':smack-openpgp') api project(':smack-openpgp')

0
smack-java8-full/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore → smack-java11-full/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore vendored
View file

0
smack-java8-full/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java → smack-java11-full/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java
View file

0
smack-java8-full/src/main/java/org/jivesoftware/smack/full/package-info.java → smack-java11-full/src/main/java/org/jivesoftware/smack/full/package-info.java
View file

0
smack-java8-full/src/main/java/org/jivesoftware/smackx/SmackExtensions.java → smack-java11-full/src/main/java/org/jivesoftware/smackx/SmackExtensions.java
View file

0
smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java → smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java
View file

0
smack-java8-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java → smack-java11-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java
View file

0
smack-java8-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java → smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java
View file

0
smack-java8-full/src/test/resources/state-graph.dot → smack-java11-full/src/test/resources/state-graph.dot
View file

0
smack-java8/build.gradle → smack-java11/build.gradle
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java → smack-java11/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java → smack-java11/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/java7/package-info.java → smack-java11/src/main/java/org/jivesoftware/smack/java7/package-info.java
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java → smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java → smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java → smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java
View file

0
smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java → smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java
View file

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java

2
smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java
View file

@ -1 +1 @@
../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java ../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java