Skip to content

Commit

Permalink
Update for JDK 17 and Gradle 7.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Local Administrator authored and Local Administrator committed Aug 12, 2022
1 parent 76fcca9 commit a248cf5
Show file tree
Hide file tree
Showing 24 changed files with 51 additions and 467 deletions.
2 changes: 1 addition & 1 deletion Gradle/JavaGradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ task runFraction(type: JavaExec) {
// Try:
// 1. Change Fraction.main so it accepts 2 arguments
// 2. Create a new gradle tasks that accepts two arguments and
// can be called as: gradle runFrac -Pdenom=4 -Pnum=3 or as gradle runFrac -Pnum=3 -Pdenom=4
// can be called as: gradle runFrac -Pdenom=4 -Pnum=3 or as gradle runFrac -Pnum=3 -Pdenom=4 , also make sure it can run with only 1 or no arguments

// Example how you can add that libraries can be pulled from mavenCentral()
// repositories {
Expand Down
3 changes: 3 additions & 0 deletions Middleware/G-RPC/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ You do not need to install anything things will run through the gradle file.

- `host`, `port` and `message` are optional arguments for the program.


The below is only needed for Python which is nothing we need for the course

#### PYTHON Install Dependencies
These need to be installed
###### (use of virtualenv recommended for `pip` installs)
Expand Down
10 changes: 5 additions & 5 deletions Middleware/G-RPC/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id "com.google.protobuf" version "0.8.13" apply true
id "com.google.protobuf" version "0.8.18" apply true
}

description = "gRPC Example"
Expand All @@ -13,21 +13,21 @@ repositories {
dependencies {
implementation 'io.grpc:grpc-netty-shaded:1.33.1'
implementation 'io.grpc:grpc-protobuf:1.33.1'
implementation 'io.grpc:grpc-stub:1.33.1'
implementation 'io.grpc:grpc-stub:1.40.1'
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.13.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.0'
}
task pythonProto(type:Exec) {
commandLine 'python3', '-m', 'grpc_tools.protoc', '-Isrc/main/proto', '--python_out=build/generated/source/proto/main/python', '--grpc_python_out=build/generated/source/proto/main/grpc/echo', 'src/main/proto/echomessage.proto'
}

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.12.0"
artifact = "com.google.protobuf:protoc:3.21.1"
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.33.1'
artifact = 'io.grpc:protoc-gen-grpc-java:1.48.1'
}
}
generateProtoTasks {
Expand Down
4 changes: 2 additions & 2 deletions Network/HTTP-JSON/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repositories {
}

dependencies{
compile 'org.json:json:20171018' // org.json
compile 'com.google.code.gson:gson:2.8.6' // Google JSON
implementation 'org.json:json:20171018' // org.json
implementation 'com.google.code.gson:gson:2.8.6' // Google JSON
}

task API(type: JavaExec) {
Expand Down
2 changes: 1 addition & 1 deletion Network/HTTP-JSON/repoShort.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"owner":"kgary","name":"AQMDev","branches":[{"name":"master"}]},{"owner":"kgary","name":"AQM_Apps","branches":[{"name":"master"}]},{"owner":"kgary","name":"AQM_Common","branches":[{"name":"master"}]},{"owner":"kgary","name":"AQM_REST","branches":[{"name":"master"},{"name":"vivien-rest"}]},{"owner":"kgary","name":"AQM_Sensor","branches":[{"name":"master"}]},{"owner":"kgary","name":"Aspira","branches":[{"name":"deploy"},{"name":"dmp"},{"name":"master"},{"name":"tablet"}]},{"owner":"kgary","name":"aspiradeploy","branches":[{"name":"master"}]},{"owner":"kgary","name":"asuhomepage","branches":[{"name":"master"}]},{"owner":"kgary","name":"ASU_AQM","branches":[{"name":"master"}]},{"owner":"kgary","name":"BrainTracker_API","branches":[{"name":"Issue1"},{"name":"dev_spring_2019"},{"name":"dev"},{"name":"master"}]},{"owner":"kgary","name":"BrainTracker_Portal","branches":[{"name":"Fix-Issue-14"},{"name":"master"},{"name":"parent-proxy-feature"}]},{"owner":"kgary","name":"cassess-capstone-team2","branches":[{"name":"SB_092"},{"name":"SMB86A"},{"name":"Test"},{"name":"US-14"},{"name":"US-18"},{"name":"US-25"},{"name":"US-37"},{"name":"US-39"},{"name":"US-43"},{"name":"US-49"},{"name":"US-53/54/9"},{"name":"US-67"},{"name":"US-72"},{"name":"US-85"},{"name":"US-101"},{"name":"US-111"},{"name":"US-120"},{"name":"US-131"},{"name":"US-166"},{"name":"US-168"},{"name":"US-169"},{"name":"US-182B"},{"name":"US12_Tsk1"},{"name":"US85"},{"name":"US86"},{"name":"US093"},{"name":"US121"},{"name":"US124"},{"name":"US125"},{"name":"US129"}]},{"owner":"kgary","name":"cassess_demo","branches":[{"name":"master"}]},{"owner":"kgary","name":"CIAssess","branches":[{"name":"master"}]},{"owner":"kgary","name":"CompassAPI","branches":[{"name":"master"}]},{"owner":"kgary","name":"cst316_gitlabupdate","branches":[{"name":"master"}]},{"owner":"kgary","name":"IGSTK-VT","branches":[{"name":"master"},{"name":"v1.0.0"},{"name":"v1.1.0"},{"name":"v1.2.0"}]},{"owner":"kgary","name":"lstudy","branches":[{"name":"master"}]},{"owner":"kgary","name":"mastodon","branches":[{"name":"HWorkaround"},{"name":"ModFollows"},{"name":"TG-15-goals"},{"name":"TG-35-API25-HotFix"},{"name":"TootRename"},{"name":"US5"},{"name":"US10-tagIdea"},{"name":"US10"},{"name":"US15-goals"},{"name":"US15"},{"name":"US45"},{"name":"US62"},{"name":"addingHomeworkFlagsToPosts"},{"name":"api25-hotfix"},{"name":"chartkick-integration"},{"name":"dependabot/bundler/rails-settings-cached-2.1.1"},{"name":"dependabot/bundler/rqrcode-1.1.2"},{"name":"dependabot/bundler/sidekiq-6.0.0"},{"name":"dependabot/npm_and_yarn/file-loader-5.0.2"},{"name":"dependabot/npm_and_yarn/object.values-1.1.1"},{"name":"dependabot/npm_and_yarn/react-hotkeys-2.0.0"},{"name":"dev"},{"name":"docs"},{"name":"env"},{"name":"feature-anomaly-detection"},{"name":"feature-collapsed-notifications"},{"name":"feature-featured-tags-activitypub"},{"name":"fix-admin-layout-scroll"},{"name":"fix-media-file-validation"},{"name":"fix-missing-locale-files"}]},{"owner":"kgary","name":"promisapiv3","branches":[{"name":"master"}]},{"owner":"kgary","name":"ReachAPI","branches":[{"name":"master"}]},{"owner":"kgary","name":"REACHv1","branches":[{"name":"Add_trick_release_days"},{"name":"ISsue#76"},{"name":"Issue#10"},{"name":"Issue#10_1"},{"name":"Issue#12"},{"name":"Issue#13"},{"name":"Issue#17"},{"name":"Issue#21"},{"name":"Issue#23#24"},{"name":"Issue#25"},{"name":"Issue#41"},{"name":"Issue#41_1"},{"name":"Issue#49"},{"name":"Issue#50#7"},{"name":"Issue#72"},{"name":"Issue#73"},{"name":"Issue#79"},{"name":"Issue#81"},{"name":"Issue#86"},{"name":"Issue#99"},{"name":"Issue#100"},{"name":"Issue#102"},{"name":"Issue#106"},{"name":"issue_51"},{"name":"issue_52"},{"name":"issue_65"},{"name":"issue_89"},{"name":"master"}]},{"owner":"kgary","name":"ser322public","branches":[{"name":"master"}]},{"owner":"kgary","name":"ser335public","branches":[{"name":"main"}]},{"owner":"kgary","name":"ser421public","branches":[{"name":"master"}]},{"owner":"kgary","name":"ser422asu_public","branches":[{"name":"master"}]},{"owner":"kgary","name":"SER_TA_Grader_App_Issues","branches":[{"name":"master"}]},{"owner":"kgary","name":"TAGraderApp","branches":[{"name":"GitHub_Issues"},{"name":"master"}]}]
[{"owner":"kgary","name":"AQMDev","branches":[{"name":"master"}]},{"owner":"kgary","name":"AQM_Apps","branches":[{"name":"master"}]},{"owner":"kgary","name":"AQM_Common","branches":[{"name":"master"}]},{"owner":"kgary","name":"AQM_REST","branches":[{"name":"master"},{"name":"vivien-rest"}]},{"owner":"kgary","name":"AQM_Sensor","branches":[{"name":"master"}]},{"owner":"kgary","name":"Aspira","branches":[{"name":"deploy"},{"name":"dmp"},{"name":"master"},{"name":"tablet"}]},{"owner":"kgary","name":"aspiradeploy","branches":[{"name":"master"}]},{"owner":"kgary","name":"asuhomepage","branches":[{"name":"master"}]},{"owner":"kgary","name":"ASU_AQM","branches":[{"name":"master"}]},{"owner":"kgary","name":"BrainTracker_API","branches":[{"name":"Issue1"},{"name":"dev_spring_2019"},{"name":"dev"},{"name":"master"}]},{"owner":"kgary","name":"BrainTracker_Portal","branches":[{"name":"Fix-Issue-14"},{"name":"master"},{"name":"parent-proxy-feature"}]},{"owner":"kgary","name":"cassess-capstone-team2","branches":[{"name":"SB_092"},{"name":"SMB86A"},{"name":"Test"},{"name":"US12_Tsk1"},{"name":"US85"},{"name":"US86"},{"name":"US093"},{"name":"US121"},{"name":"US124"},{"name":"US125"},{"name":"US129"},{"name":"US135"},{"name":"US136"},{"name":"US162"},{"name":"US169"},{"name":"US171"},{"name":"US182"},{"name":"US196"},{"name":"US201"},{"name":"US202"},{"name":"US225"},{"name":"US226"},{"name":"US235"},{"name":"US245"},{"name":"US247"},{"name":"US250"},{"name":"US-14"},{"name":"US-18"},{"name":"US-25"},{"name":"US-37"}]},{"owner":"kgary","name":"cassess_demo","branches":[{"name":"master"}]},{"owner":"kgary","name":"CIAssess","branches":[{"name":"master"}]},{"owner":"kgary","name":"CompassAPI","branches":[{"name":"master"}]},{"owner":"kgary","name":"cst316_gitlabupdate","branches":[{"name":"master"}]},{"owner":"kgary","name":"gittest","branches":[{"name":"main"}]},{"owner":"kgary","name":"IGSTK-VT","branches":[{"name":"master"},{"name":"v1.0.0"},{"name":"v1.1.0"},{"name":"v1.2.0"}]},{"owner":"kgary","name":"lstudy","branches":[{"name":"master"}]},{"owner":"kgary","name":"mastodon","branches":[{"name":"HWorkaround"},{"name":"ModFollows"},{"name":"TG-15-goals"},{"name":"TG-35-API25-HotFix"},{"name":"TootRename"},{"name":"US5"},{"name":"US10-tagIdea"},{"name":"US10"},{"name":"US15-goals"},{"name":"US15"},{"name":"US45"},{"name":"US62"},{"name":"addingHomeworkFlagsToPosts"},{"name":"api25-hotfix"},{"name":"chartkick-integration"},{"name":"dependabot/bundler/rails-settings-cached-2.1.1"},{"name":"dependabot/bundler/rqrcode-1.1.2"},{"name":"dependabot/bundler/sidekiq-6.0.0"},{"name":"dependabot/npm_and_yarn/file-loader-5.0.2"},{"name":"dependabot/npm_and_yarn/object.values-1.1.1"},{"name":"dependabot/npm_and_yarn/react-hotkeys-2.0.0"},{"name":"dev"},{"name":"docs"},{"name":"env"},{"name":"feature-anomaly-detection"},{"name":"feature-collapsed-notifications"},{"name":"feature-featured-tags-activitypub"},{"name":"fix-admin-layout-scroll"},{"name":"fix-media-file-validation"},{"name":"fix-missing-locale-files"}]},{"owner":"kgary","name":"promisapiv3","branches":[{"name":"master"}]},{"owner":"kgary","name":"ReachAPI","branches":[{"name":"master"}]},{"owner":"kgary","name":"REACHv1","branches":[{"name":"Add_trick_release_days"},{"name":"ISsue#76"},{"name":"Issue#10"},{"name":"Issue#10_1"},{"name":"Issue#12"},{"name":"Issue#13"},{"name":"Issue#17"},{"name":"Issue#21"},{"name":"Issue#23#24"},{"name":"Issue#25"},{"name":"Issue#41"},{"name":"Issue#41_1"},{"name":"Issue#49"},{"name":"Issue#50#7"},{"name":"Issue#72"},{"name":"Issue#73"},{"name":"Issue#79"},{"name":"Issue#81"},{"name":"Issue#86"},{"name":"Issue#99"},{"name":"Issue#100"},{"name":"Issue#102"},{"name":"Issue#106"},{"name":"issue_51"},{"name":"issue_52"},{"name":"issue_65"},{"name":"issue_89"},{"name":"master"}]},{"owner":"kgary","name":"ResourcesForStudents","branches":[{"name":"main"}]},{"owner":"kgary","name":"ser322public","branches":[{"name":"master"}]},{"owner":"kgary","name":"ser335public","branches":[{"name":"main"}]},{"owner":"kgary","name":"ser421public","branches":[{"name":"master"}]},{"owner":"kgary","name":"ser422asu_public","branches":[{"name":"master"}]},{"owner":"kgary","name":"ser516public","branches":[{"name":"main"}]},{"owner":"kgary","name":"SER_TA_Grader_App_Issues","branches":[{"name":"master"}]}]
14 changes: 12 additions & 2 deletions Network/IPs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@

##### Purpose
Each program has a short description as well as the Gradle file
* Please run `DatagramReceive` and `DatagramSend` together.
* Please run `DatagramReceive` and `DatagramSend` together. Start them in separate command line windows.

Shows how to get IP addresses from URLs and vice versa.
Shows how to get IP addresses from URLs and vice versa.

The following tasks are also available

gradle runBrowser --args="https://google.com"

gradle runBrowser

gradle runGetNameForIP --args='8.8.4.4'

gradle runGetIP --args='google.com'
4 changes: 2 additions & 2 deletions Network/IPs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ task runGetIP(type: JavaExec) {
// run receiver first then send

// gradle runDatagramReceive
task runDatagramReceive(type: JavaExec) {
task DatagramReceive(type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath
group = "Datagram Server/Client"
description = "Datagram Receive"
Expand All @@ -48,7 +48,7 @@ task runDatagramReceive(type: JavaExec) {
}

// gradle runDatagramSend
task runDatagramSend(type: JavaExec) {
task DatagramSend(type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath
group = "Datagram Server/Client"
description = "Datagram Send"
Expand Down
2 changes: 1 addition & 1 deletion Network/JSON/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
}

dependencies{
compile 'org.json:json:20171018' // org.json
implementation 'org.json:json:20171018' // org.json
}

// gradle JSON
Expand Down
2 changes: 2 additions & 0 deletions Network/tcp/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#### Purpose
The program demonstrates a `TCPServer` and `TCPClient` communicating using `Socket` and `ServerSocket`.
Run the server first.

The `TCPClient` sends a string message to the `TCPServer`.
The `TCPServer` listens unless interrupted or closed.
2 changes: 1 addition & 1 deletion Network/udp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ repositories {
}

dependencies{
compile 'org.json:json:20171018'
implementation 'org.json:json:20171018'
}
1 change: 1 addition & 0 deletions Network/udp/src/main/java/UDPServer2.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public static void main(String args[]){
while(true){
DatagramPacket request = new DatagramPacket(buffer, buffer.length);
aSocket.receive(request);
System.out.println("RECEIVED: " + new String(request.getData()));
// construct a reply packet from request
DatagramPacket reply = new DatagramPacket(request.getData(), request.getLength(),
request.getAddress(), request.getPort());
Expand Down
6 changes: 4 additions & 2 deletions Serialization/ClassMigration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ the serialversion of the new class which is attempting to deserialize.
Now, edit the User class again to uncomment line 45:
//private static final long serialVersionUID = -3612890521606032036L;
When you do this, assure that the definition matches that you got when running
gradle ClassMigration:runUser

##### Run
gradle runUser

Now run the program again with attempting to read:
gradle ClassMigration:runFileSerialize --args 'read'
gradle runFileSerialize --args 'read'

The result should be success. This demonstrates how serialversioning works in java.
The manuals describe what happens in this situtuation, assuming that you declare the
Expand Down
3 changes: 2 additions & 1 deletion Serialization/GroupJson/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ in the jar file: json.jar. Nevertheless, you should download the library and
generate the javadocs for the classes, which will be useful in utilizing
Json with your Java programs.

##### Run
You should execute the Java program with:
gradle GroupJson:run
gradle run

5 changes: 5 additions & 0 deletions Serialization/GroupSerialize/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
#### Purpose
An interface defining operations for managing authentication groups.


##### Run

gradle run
6 changes: 3 additions & 3 deletions Serialization/ProtocolBuffers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ Both clients run per default on
host localhost, port 9099 and file data.json -- all these can be changed
Run Java:
runClient
Run Python:
runClient
Run Python (has not been tested at the moment)
runClientPython

#### With parameters:
Java
gradle runClient -Pport=9099 -Phost='localhost' -Pfile='data.json'

Python
Python (has not been tested at the moment)
gradle runClientPython -Pport=9099 -Phost='localhost' -Pfile='data.json'
8 changes: 4 additions & 4 deletions Serialization/ProtocolBuffers/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id "com.google.protobuf" version "0.8.13" apply true
id "com.google.protobuf" version "0.8.18" apply true

}

Expand All @@ -12,13 +12,13 @@ repositories {

// json and protobuf dependencies
dependencies {
compile group: 'org.json', name: 'json', version: '20200518'
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.13.0'
implementation group: 'org.json', name: 'json', version: '20200518'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.0'
}

protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.13.0'
artifact = 'com.google.protobuf:protoc:3.21.1'
}
generateProtoTasks {
all().each { task ->
Expand Down
46 changes: 0 additions & 46 deletions Serialization/Simple/CheatSheet.txt

This file was deleted.

44 changes: 0 additions & 44 deletions Serialization/Simple/README.md

This file was deleted.

82 changes: 0 additions & 82 deletions Serialization/Simple/build.gradle

This file was deleted.

Loading

0 comments on commit a248cf5

Please sign in to comment.