Skip to content

Commit 8c566f7

Browse files
committed
Revert "Merge branch 'llm' into master"
This reverts commit e7fed49, reversing changes made to 8bd41fb.
1 parent e7fed49 commit 8c566f7

116 files changed

Lines changed: 897 additions & 4825 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/gradle.yml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Java CI with Gradle
99

1010
on:
1111
push:
12-
branches: [ "master", "llm" ]
12+
branches: [ "master" ]
1313
pull_request:
14-
branches: [ "master", "llm" ]
14+
branches: [ "master" ]
1515

1616
permissions:
1717
contents: read
@@ -21,36 +21,19 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout Repository
24-
uses: actions/checkout@v4
25-
26-
- name: Set up JDK 21
27-
uses: actions/setup-java@v4
24+
uses: actions/checkout@v3
25+
- name: Set up JDK 17
26+
uses: actions/setup-java@v3
2827
with:
29-
java-version: '21'
28+
java-version: '17'
3029
distribution: 'oracle'
31-
3230
- name: Setup Gradle
33-
uses: gradle/gradle-build-action@v3
31+
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
3432
- name: Setup Maven
3533
uses: stCarolas/setup-maven@v4.5
3634
with:
3735
maven-version: 3.9.0
38-
39-
# Build without tests
4036
- name: Build
4137
run: ./gradlew build -x test
4238
- name: Test
4339
run: ./gradlew test -PexcludeCategory="gin.category.LocalTest"
44-
45-
# Always upload logs and reports so we can inspect surefire/gradle outputs when something fails.
46-
- name: Upload logs & reports
47-
if: always()
48-
uses: actions/upload-artifact@v4
49-
with:
50-
name: build-outputs
51-
path: |
52-
build.log
53-
test.log
54-
**/build/reports/tests/**
55-
**/surefire-reports/**
56-
**/failsafe-reports/**

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ examples/unittests/ExampleTest.class
4343
examples/unittests/ExampleWithInnerClass$MyInner.class
4444
examples/unittests/ExampleWithInnerClass.class
4545
examples/unittests/ExampleWithInnerClassTest.class
46-
examples/
4746
nbproject/
4847
nb-configuration.xml
4948
.classpath

.gitmodules

Lines changed: 0 additions & 6 deletions
This file was deleted.

Docker

Lines changed: 0 additions & 1 deletion
This file was deleted.

PatchCat

Lines changed: 0 additions & 1 deletion
This file was deleted.

README-LLM.md

Lines changed: 0 additions & 137 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ code.
6161

6262
Gin requires:
6363

64-
* JDK 21
65-
* Gradle (tested with version 9.0.0)
64+
* JDK 17
65+
* Gradle (tested with version 8.0.2)
6666
* A number of dependencies, which can be downloaded manually or via Gradle (recommended)
6767
* For Maven projects: make sure the Java version is set to the same version as Gin's.
6868

@@ -74,7 +74,7 @@ The library dependencies can be found in the build.gradle file.
7474

7575
If you have multiple JREs on your system, you may need to call something
7676
like `export JAVA_HOME="/usr/lib/jvm/java-17-oracle/jre"` as well as `update-alternatives` (Linux) to ensure that Gradle
77-
uses Java 21. Many of us use <https://sdkman.io> to manage gradle/maven/java versions and Gin works well with this.
77+
uses Java 17.
7878

7979
### Important to note
8080

@@ -85,7 +85,7 @@ There are a few known issues that should be noted:
8585

8686
### Installing and Building gin
8787

88-
These instructions were tested on OS X, Ubuntu 22.04 LTS, and Linux Mint 22.1 Cinnamon.
88+
These instructions were tested on OS X and Ubuntu 22.04 LTS.
8989

9090
Clone the repo:
9191

@@ -94,7 +94,7 @@ git clone https://github.com/gintool/gin.git
9494
```
9595

9696
Build using gradle (alternatively import into your favourite IDE, such as IntelliJ). We also provide a gradle wrapper
97-
with Gradle 9.0.0.
97+
with Gradle 8.0.2.
9898

9999
```
100100
cd gin

0 commit comments

Comments
 (0)