From b6139d599b7d388d499654674d36b0240f69d286 Mon Sep 17 00:00:00 2001
From: David Baker Effendi <dbe@sun.ac.za>
Date: Fri, 25 Mar 2022 20:55:53 +0200
Subject: [PATCH] :bookmark: Release v1.1.13

---
 CHANGELOG.md                                                | 6 ++++++
 build.sbt                                                   | 4 ++--
 src/main/scala/com/github/plume/oss/domain/package.scala    | 6 ++----
 .../com/github/plume/oss/passes/base/AstCreationPass.scala  | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19083c37..c4cbacd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.13] - 2022-03-25
+
+### Changed
+
+- Upgraded Joern version and adjusted to `x2cpg` changes.
+
 ## [1.1.12] - 2022-03-24
 
 ### Fixed
diff --git a/build.sbt b/build.sbt
index d4296dc7..f64710b4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@ name := "Plume"
 inThisBuild(
   List(
     organization := "com.github.plume-oss",
-    version := "1.1.12",
+    version := "1.1.13",
     scalaVersion := "2.13.8",
     crossScalaVersions := Seq("2.13.8", "3.1.1"),
     resolvers ++= Seq(
@@ -15,7 +15,7 @@ inThisBuild(
 )
 
 val cpgVersion         = "1.3.521"
-val joernVersion       = "1.1.653"
+val joernVersion       = "1.1.661"
 val sootVersion        = "4.3.0"
 val tinkerGraphVersion = "3.4.11"
 val neo4jVersion       = "4.4.3"
diff --git a/src/main/scala/com/github/plume/oss/domain/package.scala b/src/main/scala/com/github/plume/oss/domain/package.scala
index 7b250fc8..cdb4d2df 100644
--- a/src/main/scala/com/github/plume/oss/domain/package.scala
+++ b/src/main/scala/com/github/plume/oss/domain/package.scala
@@ -47,8 +47,7 @@ package object domain {
     Base64.encodeBase64String(out.toByteArray)
   }
 
-  /** Given an object and a path, will serialize and compress the object to the given path
-    * using [[compress]].
+  /** Given an object and a path, will serialize and compress the object to the given path.
     * @param o object to serialize.
     * @param p path to write serialized data to.
     */
@@ -69,8 +68,7 @@ package object domain {
     }
   }
 
-  /** Given a path, will deserialize and decompress the file at the given path
-    * using [[decompress]].
+  /** Given a path, will deserialize and decompress the file at the given path.
     * @param p path to read deserialized data from.
     * @return the deserialized object.
     */
diff --git a/src/main/scala/com/github/plume/oss/passes/base/AstCreationPass.scala b/src/main/scala/com/github/plume/oss/passes/base/AstCreationPass.scala
index 1ce6ca16..61822921 100644
--- a/src/main/scala/com/github/plume/oss/passes/base/AstCreationPass.scala
+++ b/src/main/scala/com/github/plume/oss/passes/base/AstCreationPass.scala
@@ -25,7 +25,8 @@ class AstCreationPass(
     try {
       val sootClass = Scene.v().loadClassAndSupport(qualifiedClassName)
       sootClass.setApplicationClass()
-      new io.joern.jimple2cpg.passes.AstCreator(part, builder, global).createAst(sootClass)
+      val localDiff = new io.joern.jimple2cpg.passes.AstCreator(part, sootClass, global).createAst()
+      builder.absorb(localDiff)
     } catch {
       case e: Exception =>
         logger.warn(s"Cannot parse: $part ($qualifiedClassName)", e)