Skip to content

Commit a8a796e

Browse files
committed
Version 4.1.0:
- Kotlin upgraded to `1.8.0-RC` - Gradle upgraded to `7.6` - JavaCV upgraded to `1.5.8` - Vis-UI upgraded to `1.5.1`
1 parent f14e02a commit a8a796e

File tree

14 files changed

+29
-68
lines changed

14 files changed

+29
-68
lines changed

.idea/kotlinc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/Overwatcheat.main.iml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/Overwatcheat.test.iml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle-build/projects/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
group = "org.jire.overwatcheat.gradle_build"
66
version = "0.1.0"
77

8-
val kotlinVersion = "1.7.20"
8+
val kotlinVersion = "1.8.0-RC"
99

1010
dependencies {
1111
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")

gradle-build/projects/src/main/kotlin/org/jire/overwatcheat/gradle_build/projects/KotlinProjectPlugin.kt

-49
Original file line numberDiff line numberDiff line change
@@ -18,69 +18,20 @@
1818

1919
package org.jire.overwatcheat.gradle_build.projects
2020

21-
import org.gradle.api.JavaVersion
2221
import org.gradle.api.Plugin
2322
import org.gradle.api.Project
24-
import org.gradle.api.plugins.JavaPlugin
25-
import org.gradle.api.plugins.JavaPluginExtension
26-
import org.gradle.api.tasks.compile.JavaCompile
27-
import org.gradle.kotlin.dsl.configure
28-
import org.gradle.kotlin.dsl.dependencies
29-
import org.gradle.kotlin.dsl.withType
30-
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
31-
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
32-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3323

3424
class KotlinProjectPlugin : Plugin<Project> {
3525

3626
private fun configureCompileJava(project: Project) {
37-
project.run {
38-
plugins.withType<JavaPlugin>().configureEach {
39-
configure<JavaPluginExtension> {
40-
sourceCompatibility = JavaVersion.VERSION_17
41-
targetCompatibility = JavaVersion.VERSION_17
42-
}
43-
}
44-
45-
tasks.withType<JavaCompile>().configureEach {
46-
options.encoding = "UTF-8"
47-
options.release.set(17)
48-
}
49-
}
5027
}
5128

5229
override fun apply(target: Project) {
5330
target.run {
5431
plugins.apply("org.jetbrains.kotlin.jvm")
5532

5633
configureCompileJava(target)
57-
58-
tasks.withType<KotlinCompile>().configureEach {
59-
kotlinOptions {
60-
jvmTarget = "17"
61-
}
62-
}
63-
64-
val kotlinPluginVersion = getKotlinPluginVersion()
65-
66-
plugins.withType<KotlinPluginWrapper>().configureEach {
67-
dependencies {
68-
configurations.named("api").configure {
69-
for (module in kotlinModules) {
70-
invoke("org.jetbrains.kotlin:kotlin-$module") {
71-
version {
72-
strictly(kotlinPluginVersion)
73-
}
74-
}
75-
}
76-
}
77-
}
78-
}
7934
}
8035
}
8136

82-
private companion object {
83-
val kotlinModules = listOf("stdlib", "stdlib-common", "stdlib-jdk7", "stdlib-jdk8")
84-
}
85-
8637
}

gradle-build/settings/src/main/kotlin/org/jire/overwatcheat/gradle_build/settings/buildVersions.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ fun VersionCatalogBuilder.buildVersions() {
3131

3232
fun VersionCatalogBuilder.buildMisc() {
3333
libraryVersioned("it.unimi.dsi", "fastutil", "8.5.9")
34-
libraryVersioned("org.bytedeco", "javacv-platform", "1.5.7")
35-
libraryVersioned("com.kotcrab.vis", "vis-ui", "1.5.0")
34+
libraryVersioned("org.bytedeco", "javacv-platform", "1.5.8")
35+
libraryVersioned("com.kotcrab.vis", "vis-ui", "1.5.1")
3636
}
3737

3838
fun VersionCatalogBuilder.buildJNA() = buildGroup("net.java.dev.jna", "jna") {
@@ -66,4 +66,4 @@ fun DependencyResolutionManagement.createVersionCatalogs(name: String = "libs")
6666
create(name) {
6767
buildCatalog()
6868
}
69-
}
69+
}

gradle-build/versions/src/main/kotlin/org/jire/overwatcheat/gradle_build/versions/Versions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ package org.jire.overwatcheat.gradle_build.versions
2020

2121
object Versions {
2222

23-
const val KOTLIN = "1.7.20"
23+
const val KOTLIN = "1.8.0-RC"
2424

2525
}

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.jvmargs=-Xmx8g

gradle/wrapper/gradle-wrapper.jar

818 Bytes
Binary file not shown.
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

+8-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac

gradlew.bat

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

src/main/kotlin/org/jire/overwatcheat/Main.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.jire.overwatcheat
2020

21+
import org.bytedeco.javacv.FFmpegLogCallback
2122
import org.jire.overwatcheat.aimbot.AimBotThread
2223
import org.jire.overwatcheat.aimbot.AimColorMatcher
2324
import org.jire.overwatcheat.aimbot.AimFrameHandler
@@ -31,6 +32,8 @@ object Main {
3132

3233
@JvmStatic
3334
fun main(args: Array<String>) {
35+
FFmpegLogCallback.set()
36+
3437
Settings.read()
3538

3639
val captureWidth = Settings.boxWidth
@@ -74,4 +77,4 @@ object Main {
7477
}
7578
}
7679

77-
}
80+
}

0 commit comments

Comments
 (0)