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

Rename smack-java8(-full) to smack-java11(-full)
igniterealtime · Sep 25, 2024 · 5540063 · 5540063
2 parents 5d2ca5d + 07d9d69
commit 5540063
Show file tree

Hide file tree

Showing 28 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -95,8 +95,8 @@ jobs:
           else
               echo COVERALLS_REPO_TOKEN is not empty
           fi
-          ./gradlew smack-java8-full:testCodeCoverageReport
-          ./gradlew smack-java8-full:coveralls
+          ./gradlew smack-java11-full:testCodeCoverageReport
+          ./gradlew smack-java11-full:coveralls
 
       # Upload build artifacts
       - name: Upload build artifacts

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

diff --git a/settings.gradle b/settings.gradle
@@ -27,8 +27,8 @@ include 'smack-core',
 		'smack-bosh',
 		'smack-android',
 		'smack-android-extensions',
-		'smack-java8',
-		'smack-java8-full',
+		'smack-java11',
+		'smack-java11-full',
 		'smack-integration-test',
 		'smack-omemo',
 		'smack-omemo-signal',

diff --git a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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
diff --git a/smack-android/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-android/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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
diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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
diff --git a/smack-integration-test/build.gradle b/smack-integration-test/build.gradle
@@ -12,7 +12,7 @@ application {
 }
 
 dependencies {
-	api project(':smack-java8-full')
+	api project(':smack-java11-full')
 	api project(':smack-resolver-dnsjava')
 	implementation project(':smack-websocket-java11')
 	implementation "com.google.guava:guava:${guavaVersion}"

diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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
diff --git a/smack-java8-full/build.gradle → smack-java11-full/build.gradle b/smack-java8-full/build.gradle → smack-java11-full/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 	api project(':smack-debug')
 	api project(':smack-experimental')
 	api project(':smack-extensions')
-	api project(':smack-java8')
+	api project(':smack-java11')
 	api project(':smack-legacy')
 	api project(':smack-omemo')
 	api project(':smack-openpgp')

diff --git a/...esoftware/smack/full/doc-files/.gitignore → ...esoftware/smack/full/doc-files/.gitignore b/...esoftware/smack/full/doc-files/.gitignore → ...esoftware/smack/full/doc-files/.gitignore
diff --git a/...ularXmppClientToServerConnectionTool.java → ...ularXmppClientToServerConnectionTool.java b/...ularXmppClientToServerConnectionTool.java → ...ularXmppClientToServerConnectionTool.java
diff --git a/...jivesoftware/smack/full/package-info.java → ...jivesoftware/smack/full/package-info.java b/...jivesoftware/smack/full/package-info.java → ...jivesoftware/smack/full/package-info.java
diff --git a/.../jivesoftware/smackx/SmackExtensions.java → .../jivesoftware/smackx/SmackExtensions.java b/.../jivesoftware/smackx/SmackExtensions.java → .../jivesoftware/smackx/SmackExtensions.java
diff --git a/...org/jivesoftware/smackx/package-info.java → ...org/jivesoftware/smackx/package-info.java b/...org/jivesoftware/smackx/package-info.java → ...org/jivesoftware/smackx/package-info.java
diff --git a/...ll/ExtensionElementQNameDeclaredTest.java → ...ll/ExtensionElementQNameDeclaredTest.java b/...ll/ExtensionElementQNameDeclaredTest.java → ...ll/ExtensionElementQNameDeclaredTest.java
diff --git a/...ientToServerConnectionStateGraphTest.java → ...ientToServerConnectionStateGraphTest.java b/...ientToServerConnectionStateGraphTest.java → ...ientToServerConnectionStateGraphTest.java
diff --git a/...8-full/src/test/resources/state-graph.dot → ...1-full/src/test/resources/state-graph.dot b/...8-full/src/test/resources/state-graph.dot → ...1-full/src/test/resources/state-graph.dot
diff --git a/smack-java8/build.gradle → smack-java11/build.gradle b/smack-java8/build.gradle → smack-java11/build.gradle
diff --git a/...re/smack/java7/Java7SmackInitializer.java → ...re/smack/java7/Java7SmackInitializer.java b/...re/smack/java7/Java7SmackInitializer.java → ...re/smack/java7/Java7SmackInitializer.java
diff --git a/...are/smack/java7/XmppHostnameVerifier.java → ...are/smack/java7/XmppHostnameVerifier.java b/...are/smack/java7/XmppHostnameVerifier.java → ...are/smack/java7/XmppHostnameVerifier.java
diff --git a/...ivesoftware/smack/java7/package-info.java → ...ivesoftware/smack/java7/package-info.java b/...ivesoftware/smack/java7/package-info.java → ...ivesoftware/smack/java7/package-info.java
diff --git a/...ringencoder/java7/Java7Base64Encoder.java → ...ringencoder/java7/Java7Base64Encoder.java b/...ringencoder/java7/Java7Base64Encoder.java → ...ringencoder/java7/Java7Base64Encoder.java
diff --git a/...oder/java7/Java7Base64UrlSafeEncoder.java → ...oder/java7/Java7Base64UrlSafeEncoder.java b/...oder/java7/Java7Base64UrlSafeEncoder.java → ...oder/java7/Java7Base64UrlSafeEncoder.java
diff --git a/...til/stringencoder/java7/package-info.java → ...til/stringencoder/java7/package-info.java b/...til/stringencoder/java7/package-info.java → ...til/stringencoder/java7/package-info.java
diff --git a/...mack/util/stringencoder/package-info.java → ...mack/util/stringencoder/package-info.java b/...mack/util/stringencoder/package-info.java → ...mack/util/stringencoder/package-info.java
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -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