Feature/prijava ottf (#5)

* Update README.md * Update README.md * Update README.md * Updated login * Updating OTTF parser * Updated OTTF * Code formatting
chocoearly44 · Jul 26, 2022 · 5780a13 · 5780a13
1 parent d39a1cd
commit 5780a13
Show file tree

Hide file tree

Showing 34 changed files with 492 additions and 737 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img align="center" src="./assets/icon.png" height="150px">
+  <img align="center" src="./assets/icon.svg" height="150px">
 </p>
 
 <h1 align="center">Java eAsistent API</h1>
@@ -8,7 +8,7 @@
 
 <div align="center">
 
-[![JitPack][jitpack-shield]][jitpack-url]
+[![OTTF][ottf-shield]][ottf-url]
 [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]
@@ -17,69 +17,80 @@
 
 </div>
 
-## Dokumentacija
+## Documentation
 Vse metode so dokumentirane in opisane v odseku [Wiki][wiki-url].
 
-## Namestitev
+## Installation
+Zamenjajte VERSION z zadnjo različico iz [releases][releases-url].
+
 ### Maven
-1. Dodajte repozitorij v pom.xml datoteko
+1. [Avtenticiraje se z GitHub Packages](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-to-github-packages)
+
+2. Dodajte repozitorij
 ```xml
-<repositories>
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-</repositories>
+<repository>
+  <id>github</id>
+  <url>https://maven.pkg.github.com/chocoearly44/jea</url>
+  <snapshots>
+    <enabled>true</enabled>
+  </snapshots>
+</repository>
 ```
 
-2. Dodajte knjižnjico
+3. Dodajte knjižnjico
 ```xml
 <dependency>
-    <groupId>com.github.chocoearly44</groupId>
-    <artifactId>JEA</artifactId>
-    <version>Tag</version>
+  <groupId>tk.thesuperlab</groupId>
+  <artifactId>jea</artifactId>
+  <version>VERSION</version>
 </dependency>
 ```
 
 ### Gradle
-1. Dodajte repozitorij v gradle datoteko
+1. [Avtenticiraje se z GitHub Packages](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-to-github-packages)
+
+2. Dodajte repozitorij
 ```groovy
-allprojects {
-    repositories {
-        maven { url 'https://jitpack.io' }
+repositories {
+  maven {
+    url = uri("https://maven.pkg.github.com/chocoearly44/jea")
+    credentials {
+      username = System.getenv("USERNAME")
+      password = System.getenv("TOKEN")
     }
+  }
 }
 ```
 
-2. Dodajte knjižnjico
+3. Dodajte knjižnjico
 ```groovy
 dependencies {
-    implementation 'com.github.chocoearly44:JEA:Tag'
+  implementation 'tk.thesuperlab:jea:VERSION'
 }
 ```
 
 ## Zahvale
 Knjižnjica bazira na projektu eAsistent wrapper za Python, ki ga je naredil [LevecGG](https://github.com/LevecGG).
 
 ## Poročanje o napakah
-Če med uporabo knjižnice naletite na kakršne koli napake, jih prijavite v odseku [Issues][issues-url].
+Če med uporabo JEA naletite na kakršne koli napake, jih prijavite v odseku [Issues][issues-url].
 
 ## Podpora
-Dodatno podporo lahko prejmete v odseku [Discussions][discussions-url] tukaj na GitHubu.
+Dodatno podporo lahko prejmete v odseku [Discussions][discussions-url].
 
+[ottf-shield]: https://img.shields.io/badge/OTTF-v1.0-blueviolet?style=for-the-badge
 [contributors-shield]: https://img.shields.io/github/contributors/chocoearly44/JEA.svg?style=for-the-badge
 [forks-shield]: https://img.shields.io/github/forks/chocoearly44/JEA.svg?style=for-the-badge
 [stars-shield]: https://img.shields.io/github/stars/chocoearly44/JEA.svg?style=for-the-badge
 [issues-shield]: https://img.shields.io/github/issues/chocoearly44/JEA.svg?style=for-the-badge
 [license-shield]: https://img.shields.io/github/license/chocoearly44/JEA.svg?style=for-the-badge
-[jitpack-shield]: https://img.shields.io/jitpack/v/github/chocoearly44/JEA?style=for-the-badge
 
+[ottf-url]: https://github.com/OpenTimetable/OpenTimetable-v1
 [contributors-url]: https://github.com/chocoearly44/JEA/graphs/contributors
 [forks-url]: https://github.com/chocoearly44/JEA/network/members
 [stars-url]: https://github.com/chocoearly44/JEA/stargazers
 [issues-url]: https://github.com/chocoearly44/JEA/issues
 [license-url]: https://github.com/chocoearly44/JEA/blob/master/LICENSE
-[jitpack-url]: https://jitpack.io/#chocoearly44/JEA
 [wiki-url]: https://github.com/chocoearly44/JEA/wiki
 [releases-url]: https://github.com/chocoearly44/JEA/releases
-[discussions-url]: https://github.com/chocoearly44/JEA/discussions
+[discussions-url]: https://github.com/chocoearly44/JEA/discussions
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/icon.svg b/assets/icon.svg
diff --git a/jitpack.yml b/jitpack.yml
diff --git a/pom.xml b/pom.xml
@@ -1,48 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>tk.thesuperlab</groupId>
 	<artifactId>jea</artifactId>
-	<version>2.1</version>
+	<version>2.2</version>
+	<name>JEA</name>
 
 	<properties>
 		<maven.compiler.source>8</maven.compiler.source>
 		<maven.compiler.target>8</maven.compiler.target>
 	</properties>
 
+	<distributionManagement>
+		<repository>
+			<id>github</id>
+			<name>GitHub chocoearly44 Apache Maven Packages</name>
+			<url>https://maven.pkg.github.com/chocoearly44/jea</url>
+		</repository>
+	</distributionManagement>
+
 	<repositories>
 		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
+			<id>github</id>
+			<url>https://maven.pkg.github.com/opentimetable/ottf4j</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 
 	<dependencies>
+		<!-- Custom -->
 		<dependency>
-			<groupId>com.github.OpenTimeTable</groupId>
-			<artifactId>JavaOTTF</artifactId>
+			<groupId>org.opentimetable</groupId>
+			<artifactId>ottf4j</artifactId>
 			<version>1.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>4.10.0</version>
+		</dependency>
+
+		<!-- JSON -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.13.1</version>
+			<version>2.13.3</version>
 		</dependency>
 
 		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>4.9.3</version>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.24</version>
+		</dependency>
+
+		<!-- JUnit -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.8.2</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-			<version>1.14.3</version>
+			<groupId>io.hosuaby</groupId>
+			<artifactId>inject-resources-junit-jupiter</artifactId>
+			<version>0.3.2</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>