Skip to content

Commit

Permalink
Bump Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
bitPogo committed Nov 4, 2023
1 parent 65439de commit cfadb1d
Show file tree
Hide file tree
Showing 34 changed files with 78 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .java_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
17
6 changes: 2 additions & 4 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ android {
}

kotlin {
android()
androidTarget()

js(IR) {
nodejs()
Expand Down Expand Up @@ -143,9 +143,7 @@ kotlin {
}
}

setupAndroidTest()

val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(antibytesCatalog.jvm.test.kotlin.core)
implementation(antibytesCatalog.jvm.test.kotlin.junit4)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture

import java.util.concurrent.ConcurrentHashMap
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture

import kotlin.reflect.KClass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("OPT_IN_USAGE")
@file:Suppress("OPT_IN_USAGE", "ktlint:standard:filename")

package tech.antibytes.kfixture

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture

@InternalAPI
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("OPT_IN_USAGE")
@file:Suppress("OPT_IN_USAGE", "ktlint:standard:filename")

package tech.antibytes.kfixture

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("FINAL_UPPER_BOUND", "OPT_IN_USAGE")
@file:Suppress("FINAL_UPPER_BOUND", "OPT_IN_USAGE", "ktlint:standard:filename")

package tech.antibytes.kfixture

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("OPT_IN_USAGE")
@file:Suppress("OPT_IN_USAGE", "ktlint:standard:filename")

package tech.antibytes.kfixture

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("OPT_IN_USAGE")
@file:Suppress("OPT_IN_USAGE", "ktlint:standard:filename")

package tech.antibytes.kfixture

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture.generator.selector

import tech.antibytes.kfixture.PublicApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ class RangedSpecialArrayFixtureSpec {
RangeType,
PublicApi.Qualifier?,
Function1<RangeType?, Boolean>,
FixtureType,> {
FixtureType,
> {
return when (FixtureType::class) {
CharArray::class -> { fixture, from, to, qualifier, predicate ->
fixture.fixture<Char, CharArray>(
Expand Down Expand Up @@ -294,7 +295,8 @@ class RangedSpecialArrayFixtureSpec {
RangeType,
PublicApi.Qualifier?,
Function1<RangeType?, Boolean>,
FixtureType?,> {
FixtureType?,
> {
return when (FixtureType::class) {
CharArray::class -> { fixture, from, to, qualifier, predicate ->
fixture.fixture<Char, CharArray?>(
Expand Down Expand Up @@ -1643,7 +1645,8 @@ class RangedSpecialArrayFixtureSpec {
ClosedRange<Comparable<Any>>,
PublicApi.Qualifier?,
Function1<RangeType?, Boolean>,
FixtureType,> {
FixtureType,
> {
return when (FixtureType::class) {
CharArray::class -> { fixture, range, qualifier, predicate ->
fixture.fixture<Char, CharArray>(
Expand Down Expand Up @@ -1739,7 +1742,8 @@ class RangedSpecialArrayFixtureSpec {
ClosedRange<Comparable<Any>>,
PublicApi.Qualifier?,
Function1<RangeType?, Boolean>,
FixtureType?,> {
FixtureType?,
> {
return when (FixtureType::class) {
CharArray::class -> { fixture, range, qualifier, predicate ->
fixture.fixture<Char, CharArray?>(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture

import kotlin.reflect.KClass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture

import java.util.concurrent.ConcurrentHashMap
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture

import kotlin.reflect.KClass
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ kotlin.mpp.stability.nowarn=true
kotlin.code.style=official
# Native
kotlin.native.ignoreIncorrectDependencies=true
kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.mpp.enableCInteropCommonization=true
kotlin.native.cacheKind=none
kotlin.native.osVersionMin.ios_x64=14.0
Expand All @@ -26,6 +25,5 @@ kotlin.native.binary.memoryModel=experimental
# Android
android.useAndroidX=true
android.enableJetifier=false
android.disableAutomaticComponentCreation=true
# see: https://github.com/robolectric/robolectric/issues/6521
android.jetifier.ignorelist=bcprov
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
35 changes: 22 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
6 changes: 2 additions & 4 deletions ktx-datetime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ android {
}

kotlin {
android()
androidTarget()

js(IR) {
nodejs()
Expand Down Expand Up @@ -136,9 +136,7 @@ kotlin {
}
}

setupAndroidTest()

val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(antibytesCatalog.jvm.test.kotlin.core)
implementation(antibytesCatalog.jvm.test.kotlin.junit4)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture.ktx.datetime

import kotlinx.datetime.DatePeriod
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("OPT_IN_USAGE")
@file:Suppress("OPT_IN_USAGE", "ktlint:standard:filename")

package tech.antibytes.kfixture.ktx.datetime.fixture

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* ktlint-disable filename */
/*
* Copyright (c) 2022 Matthias Geisler (bitPogo) / All rights reserved.
*
* Use of this source code is governed by Apache v2.0
*/

@file:Suppress("ktlint:standard:filename")

package tech.antibytes.kfixture.ktx.datetime.fixture

import kotlin.jvm.JvmName
Expand Down
Loading

0 comments on commit cfadb1d

Please sign in to comment.