Skip to content

Commit 3ebbc45

Browse files
authored
Merge pull request #316 from RamAnvesh/main
Resolve Merge conflicts
2 parents 13d5407 + 84b9b68 commit 3ebbc45

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
ext {
66
clojarsusername = project.properties['clojarsusername'] ?: ""
77
clojarspassword = project.properties['clojarspassword'] ?: ""
8-
krystal_version = '8.0.1'
8+
krystal_version = '9.0.0-SNAPSHOT'
99
}
1010

1111
checkerFramework {

vajram/vajram-krystex/src/main/java/com/flipkart/krystal/vajramexecutor/krystex/InputBatcherConfig.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
import com.flipkart.krystal.krystex.logicdecoration.LogicExecutionContext;
1010
import com.flipkart.krystal.krystex.logicdecoration.OutputLogicDecorator;
1111
import com.flipkart.krystal.krystex.logicdecoration.OutputLogicDecoratorConfig.LogicDecoratorContext;
12+
import com.flipkart.krystal.vajram.BatchableVajram;
1213
import com.flipkart.krystal.vajram.IOVajram;
13-
import com.flipkart.krystal.vajram.Vajram;
1414
import com.flipkart.krystal.vajram.VajramDef;
1515
import com.flipkart.krystal.vajram.VajramID;
16-
import com.flipkart.krystal.vajram.BatchableVajram;
1716
import com.flipkart.krystal.vajram.batching.FacetsConverter;
1817
import com.flipkart.krystal.vajram.batching.InputBatcher;
1918
import com.flipkart.krystal.vajram.batching.InputBatcherImpl;
@@ -31,7 +30,6 @@
3130
import java.util.HashMap;
3231
import java.util.HashSet;
3332
import java.util.LinkedHashSet;
34-
import java.util.LinkedList;
3533
import java.util.List;
3634
import java.util.Map;
3735
import java.util.Map.Entry;

vajram/vajram-krystex/src/main/java/com/flipkart/krystal/vajramexecutor/krystex/inputinjection/KryonInputInjector.java

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import com.flipkart.krystal.krystex.kryondecoration.KryonDecorationInput;
77
import com.flipkart.krystal.krystex.kryondecoration.KryonDecorator;
88
import com.flipkart.krystal.vajramexecutor.krystex.VajramKryonGraph;
9-
import java.util.LinkedHashMap;
10-
import java.util.Map;
119
import org.checkerframework.checker.initialization.qual.NotOnlyInitialized;
1210
import org.checkerframework.checker.initialization.qual.UnknownInitialization;
1311
import org.checkerframework.checker.nullness.qual.Nullable;

0 commit comments

Comments
 (0)