Skip to content

Commit 9adfcee

Browse files
authored
Merge pull request #636 from Kotlin/version-bump-to-0.14.0
Dev version bump to 0.14.0 & updating deprecations
2 parents 4efe154 + 25200a7 commit 9adfcee

File tree

41 files changed

+331
-863
lines changed

Some content is hidden

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

41 files changed

+331
-863
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ public interface ColumnsSelectionDsl<out T> : /* SingleColumn<DataRow<T>> */
484484
@Deprecated(
485485
message = COL_SELECT_DSL_LIST_DATACOLUMN_GET,
486486
replaceWith = ReplaceWith(COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE),
487-
level = DeprecationLevel.WARNING,
487+
level = DeprecationLevel.ERROR,
488488
)
489489
public operator fun <C> List<DataColumn<C>>.get(range: IntRange): ColumnSet<C> =
490490
ColumnsList(subList(range.first, range.last + 1))

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import org.jetbrains.kotlinx.dataframe.index
1515
import org.jetbrains.kotlinx.dataframe.indices
1616
import org.jetbrains.kotlinx.dataframe.ncol
1717
import org.jetbrains.kotlinx.dataframe.nrow
18-
import org.jetbrains.kotlinx.dataframe.util.DIFF_DEPRECATION_MESSAGE
19-
import org.jetbrains.kotlinx.dataframe.util.DIFF_OR_NULL_IMPORT
20-
import org.jetbrains.kotlinx.dataframe.util.DIFF_REPLACE_MESSAGE
2118
import kotlin.experimental.ExperimentalTypeInference
2219
import kotlin.reflect.KProperty
2320
import kotlin.reflect.KType
@@ -162,40 +159,6 @@ public fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Long>): Long?
162159
public fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Float>): Float? =
163160
prev()?.let { p -> expression(this, this) - expression(p, p) }
164161

165-
@OptIn(ExperimentalTypeInference::class)
166-
@OverloadResolutionByLambdaReturnType
167-
@Deprecated(
168-
DIFF_DEPRECATION_MESSAGE,
169-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
170-
DeprecationLevel.ERROR,
171-
)
172-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Double>): Double? =
173-
prev()?.let { p -> expression(this, this) - expression(p, p) }
174-
175-
@Deprecated(
176-
DIFF_DEPRECATION_MESSAGE,
177-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
178-
DeprecationLevel.ERROR,
179-
)
180-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Int>): Int? =
181-
prev()?.let { p -> expression(this, this) - expression(p, p) }
182-
183-
@Deprecated(
184-
DIFF_DEPRECATION_MESSAGE,
185-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
186-
DeprecationLevel.ERROR,
187-
)
188-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Long>): Long? =
189-
prev()?.let { p -> expression(this, this) - expression(p, p) }
190-
191-
@Deprecated(
192-
DIFF_DEPRECATION_MESSAGE,
193-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
194-
DeprecationLevel.ERROR,
195-
)
196-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Float>): Float? =
197-
prev()?.let { p -> expression(this, this) - expression(p, p) }
198-
199162
public fun AnyRow.columnsCount(): Int = df().ncol
200163

201164
public fun AnyRow.columnNames(): List<String> = df().columnNames()

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Lines changed: 76 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10128,64 +10128,120 @@ public interface AllColumnsSelectionDsl {
1012810128

1012910129
// region deprecated
1013010130

10131-
@Deprecated(COL_SELECT_DSL_ALL_COLS, ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE))
10131+
@Deprecated(
10132+
COL_SELECT_DSL_ALL_COLS,
10133+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE),
10134+
level = DeprecationLevel.ERROR
10135+
)
1013210136
public fun SingleColumn<DataRow<*>>.all(): TransformableColumnSet<*> = allCols()
1013310137

10134-
@Deprecated(COL_SELECT_DSL_ALL_COLS, ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE))
10138+
@Deprecated(
10139+
COL_SELECT_DSL_ALL_COLS,
10140+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE),
10141+
level = DeprecationLevel.ERROR
10142+
)
1013510143
public fun String.all(): TransformableColumnSet<*> = allCols()
1013610144

10137-
@Deprecated(COL_SELECT_DSL_ALL_COLS_AFTER, ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE))
10145+
@Deprecated(
10146+
COL_SELECT_DSL_ALL_COLS_AFTER,
10147+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
10148+
level = DeprecationLevel.ERROR
10149+
)
1013810150
public fun SingleColumn<DataRow<*>>.allAfter(column: ColumnPath): ColumnSet<*> = allColsAfter(column)
1013910151

10140-
@Deprecated(COL_SELECT_DSL_ALL_COLS_AFTER, ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE))
10152+
@Deprecated(
10153+
COL_SELECT_DSL_ALL_COLS_AFTER,
10154+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
10155+
level = DeprecationLevel.ERROR
10156+
)
1014110157
public fun SingleColumn<DataRow<*>>.allAfter(column: String): ColumnSet<*> = allColsAfter(column)
1014210158

10143-
@Deprecated(COL_SELECT_DSL_ALL_COLS_AFTER, ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE))
10159+
@Deprecated(
10160+
COL_SELECT_DSL_ALL_COLS_AFTER,
10161+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
10162+
level = DeprecationLevel.ERROR
10163+
)
1014410164
public fun SingleColumn<DataRow<*>>.allAfter(column: AnyColumnReference): ColumnSet<*> = allColsAfter(column)
1014510165

10146-
@Deprecated(COL_SELECT_DSL_ALL_COLS_BEFORE, ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE))
10166+
@Deprecated(
10167+
COL_SELECT_DSL_ALL_COLS_BEFORE,
10168+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
10169+
level = DeprecationLevel.ERROR
10170+
)
1014710171
public fun SingleColumn<DataRow<*>>.allBefore(column: ColumnPath): ColumnSet<*> = allColsBefore(column)
1014810172

10149-
@Deprecated(COL_SELECT_DSL_ALL_COLS_BEFORE, ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE))
10173+
@Deprecated(
10174+
COL_SELECT_DSL_ALL_COLS_BEFORE,
10175+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
10176+
level = DeprecationLevel.ERROR
10177+
)
1015010178
public fun SingleColumn<DataRow<*>>.allBefore(column: String): ColumnSet<*> = allColsBefore(column)
1015110179

10152-
@Deprecated(COL_SELECT_DSL_ALL_COLS_BEFORE, ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE))
10180+
@Deprecated(
10181+
COL_SELECT_DSL_ALL_COLS_BEFORE,
10182+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
10183+
level = DeprecationLevel.ERROR
10184+
)
1015310185
public fun SingleColumn<DataRow<*>>.allBefore(column: AnyColumnReference): ColumnSet<*> = allColsBefore(column)
1015410186

10155-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE))
10187+
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
1015610188
public fun ColumnsSelectionDsl<*>.allSince(column: ColumnPath): ColumnSet<*> = allFrom(column)
1015710189

10158-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE))
10190+
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
1015910191
public fun ColumnsSelectionDsl<*>.allSince(column: String): ColumnSet<*> = allFrom(column)
1016010192

10161-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE))
10193+
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
1016210194
public fun ColumnsSelectionDsl<*>.allSince(column: AnyColumnReference): ColumnSet<*> = allFrom(column)
1016310195

10164-
@Deprecated(COL_SELECT_DSL_ALL_COLS_FROM, ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE))
10196+
@Deprecated(
10197+
COL_SELECT_DSL_ALL_COLS_FROM,
10198+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
10199+
level = DeprecationLevel.ERROR
10200+
)
1016510201
public fun SingleColumn<DataRow<*>>.allSince(column: ColumnPath): ColumnSet<*> = allColsFrom(column)
1016610202

10167-
@Deprecated(COL_SELECT_DSL_ALL_COLS_FROM, ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE))
10203+
@Deprecated(
10204+
COL_SELECT_DSL_ALL_COLS_FROM,
10205+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
10206+
level = DeprecationLevel.ERROR
10207+
)
1016810208
public fun SingleColumn<DataRow<*>>.allSince(column: String): ColumnSet<*> = allColsFrom(column)
1016910209

10170-
@Deprecated(COL_SELECT_DSL_ALL_COLS_FROM, ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE))
10210+
@Deprecated(
10211+
COL_SELECT_DSL_ALL_COLS_FROM,
10212+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
10213+
level = DeprecationLevel.ERROR
10214+
)
1017110215
public fun SingleColumn<DataRow<*>>.allSince(column: AnyColumnReference): ColumnSet<*> = allColsFrom(column)
1017210216

10173-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE))
10217+
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
1017410218
public fun ColumnsSelectionDsl<*>.allUntil(column: ColumnPath): ColumnSet<*> = allUpTo(column)
1017510219

10176-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE))
10220+
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
1017710221
public fun ColumnsSelectionDsl<*>.allUntil(column: String): ColumnSet<*> = allUpTo(column)
1017810222

10179-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE))
10223+
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
1018010224
public fun ColumnsSelectionDsl<*>.allUntil(column: AnyColumnReference): ColumnSet<*> = allUpTo(column)
1018110225

10182-
@Deprecated(COL_SELECT_DSL_ALL_COLS_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE))
10226+
@Deprecated(
10227+
COL_SELECT_DSL_ALL_COLS_UP_TO,
10228+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
10229+
level = DeprecationLevel.ERROR
10230+
)
1018310231
public fun SingleColumn<DataRow<*>>.allUntil(column: ColumnPath): ColumnSet<*> = allColsUpTo(column)
1018410232

10185-
@Deprecated(COL_SELECT_DSL_ALL_COLS_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE))
10233+
@Deprecated(
10234+
COL_SELECT_DSL_ALL_COLS_UP_TO,
10235+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
10236+
level = DeprecationLevel.ERROR
10237+
)
1018610238
public fun SingleColumn<DataRow<*>>.allUntil(column: String): ColumnSet<*> = allColsUpTo(column)
1018710239

10188-
@Deprecated(COL_SELECT_DSL_ALL_COLS_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE))
10240+
@Deprecated(
10241+
COL_SELECT_DSL_ALL_COLS_UP_TO,
10242+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
10243+
level = DeprecationLevel.ERROR
10244+
)
1018910245
public fun SingleColumn<DataRow<*>>.allUntil(column: AnyColumnReference): ColumnSet<*> = allColsUpTo(column)
1019010246

1019110247
// endregion

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4668,111 +4668,111 @@ public interface AllExceptColumnsSelectionDsl {
46684668
@Deprecated(
46694669
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
46704670
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_SELECTOR),
4671-
level = DeprecationLevel.WARNING,
4671+
level = DeprecationLevel.ERROR,
46724672
)
46734673
public infix fun <C> SingleColumn<DataRow<C>>.except(selector: ColumnsSelector<C, *>): ColumnSet<*> =
46744674
allColsExcept(selector)
46754675

46764676
@Deprecated(
46774677
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
46784678
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVER),
4679-
level = DeprecationLevel.WARNING,
4679+
level = DeprecationLevel.ERROR,
46804680
)
46814681
public infix fun SingleColumn<DataRow<*>>.except(other: ColumnsResolver<*>): ColumnSet<*> =
46824682
allColsExcept { other }
46834683

46844684
@Deprecated(
46854685
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
46864686
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVERS),
4687-
level = DeprecationLevel.WARNING,
4687+
level = DeprecationLevel.ERROR,
46884688
)
46894689
public fun SingleColumn<DataRow<*>>.except(vararg others: ColumnsResolver<*>): ColumnSet<*> =
46904690
allColsExcept { others.toColumnSet() }
46914691

46924692
@Deprecated(
46934693
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
46944694
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER),
4695-
level = DeprecationLevel.WARNING,
4695+
level = DeprecationLevel.ERROR,
46964696
)
46974697
public infix fun SingleColumn<DataRow<*>>.except(other: String): ColumnSet<*> =
46984698
allColsExcept(other)
46994699

47004700
@Deprecated(
47014701
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
47024702
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS),
4703-
level = DeprecationLevel.WARNING,
4703+
level = DeprecationLevel.ERROR,
47044704
)
47054705
public fun SingleColumn<DataRow<*>>.except(vararg others: String): ColumnSet<*> =
47064706
allColsExcept(*others)
47074707

47084708
@Deprecated(
47094709
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
47104710
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER),
4711-
level = DeprecationLevel.WARNING,
4711+
level = DeprecationLevel.ERROR,
47124712
)
47134713
public infix fun SingleColumn<DataRow<*>>.except(other: KProperty<*>): ColumnSet<*> =
47144714
allColsExcept(other)
47154715

47164716
@Deprecated(
47174717
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
47184718
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS),
4719-
level = DeprecationLevel.WARNING,
4719+
level = DeprecationLevel.ERROR,
47204720
)
47214721
public fun SingleColumn<DataRow<*>>.except(vararg others: KProperty<*>): ColumnSet<*> =
47224722
allColsExcept(*others)
47234723

47244724
@Deprecated(
47254725
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
47264726
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER),
4727-
level = DeprecationLevel.WARNING,
4727+
level = DeprecationLevel.ERROR,
47284728
)
47294729
public infix fun SingleColumn<DataRow<*>>.except(other: ColumnPath): ColumnSet<*> =
47304730
allColsExcept(other)
47314731

47324732
@Deprecated(
47334733
message = COL_SELECT_DSL_SINGLE_COL_EXCEPT,
47344734
replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS),
4735-
level = DeprecationLevel.WARNING,
4735+
level = DeprecationLevel.ERROR,
47364736
)
47374737
public fun SingleColumn<DataRow<*>>.except(vararg others: ColumnPath): ColumnSet<*> =
47384738
allColsExcept(*others)
47394739

47404740
@Deprecated(
47414741
message = COL_SELECT_DSL_EXCEPT,
47424742
replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_SELECTOR),
4743-
level = DeprecationLevel.WARNING,
4743+
level = DeprecationLevel.ERROR,
47444744
)
47454745
public fun <C> ColumnsSelectionDsl<C>.except(selector: ColumnsSelector<C, *>): ColumnSet<*> =
47464746
allExcept(selector)
47474747

47484748
@Deprecated(
47494749
message = COL_SELECT_DSL_EXCEPT,
47504750
replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER),
4751-
level = DeprecationLevel.WARNING,
4751+
level = DeprecationLevel.ERROR,
47524752
)
47534753
public fun ColumnsSelectionDsl<*>.except(vararg others: ColumnsResolver<*>): ColumnSet<*> =
47544754
allExcept(*others)
47554755

47564756
@Deprecated(
47574757
message = COL_SELECT_DSL_EXCEPT,
47584758
replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER),
4759-
level = DeprecationLevel.WARNING,
4759+
level = DeprecationLevel.ERROR,
47604760
)
47614761
public fun ColumnsSelectionDsl<*>.except(vararg others: String): ColumnSet<*> =
47624762
allExcept(*others)
47634763

47644764
@Deprecated(
47654765
message = COL_SELECT_DSL_EXCEPT,
47664766
replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER),
4767-
level = DeprecationLevel.WARNING,
4767+
level = DeprecationLevel.ERROR,
47684768
)
47694769
public fun ColumnsSelectionDsl<*>.except(vararg others: KProperty<*>): ColumnSet<*> =
47704770
allExcept(*others)
47714771

47724772
@Deprecated(
47734773
message = COL_SELECT_DSL_EXCEPT,
47744774
replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER),
4775-
level = DeprecationLevel.WARNING,
4775+
level = DeprecationLevel.ERROR,
47764776
)
47774777
public fun ColumnsSelectionDsl<*>.except(vararg others: ColumnPath): ColumnSet<*> =
47784778
allExcept(*others)

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.jetbrains.kotlinx.dataframe.api
22

33
import org.jetbrains.kotlinx.dataframe.AnyColumnGroupAccessor
44
import org.jetbrains.kotlinx.dataframe.ColumnGroupReference
5-
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
65
import org.jetbrains.kotlinx.dataframe.DataFrame
76
import org.jetbrains.kotlinx.dataframe.DataRow
7+
import org.jetbrains.kotlinx.dataframe.api.ColGroupColumnsSelectionDsl.Grammar
88
import org.jetbrains.kotlinx.dataframe.api.ColGroupColumnsSelectionDsl.Grammar.ColumnGroupName
99
import org.jetbrains.kotlinx.dataframe.api.ColGroupColumnsSelectionDsl.Grammar.ColumnSetName
1010
import org.jetbrains.kotlinx.dataframe.api.ColGroupColumnsSelectionDsl.Grammar.PlainDslName
@@ -22,8 +22,6 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt
2222
import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve
2323
import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl
2424
import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle
25-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_GROUP
26-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_GROUP_REPLACE
2725
import kotlin.reflect.KProperty
2826

2927
// region ColumnsSelectionDsl
@@ -3475,17 +3473,6 @@ public interface ColGroupColumnsSelectionDsl {
34753473
columnGroup(this).colGroup<C>(index)
34763474

34773475
// endregion
3478-
3479-
// region deprecated
3480-
3481-
@Deprecated(
3482-
message = COL_SELECT_DSL_GROUP,
3483-
replaceWith = ReplaceWith(COL_SELECT_DSL_GROUP_REPLACE),
3484-
level = DeprecationLevel.ERROR,
3485-
)
3486-
public fun ColumnsContainer<*>.group(name: String): ColumnGroupReference = name.toColumnOf()
3487-
3488-
// endregion
34893476
}
34903477

34913478
/**

0 commit comments

Comments
 (0)