Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
1e1affd5
Unverified
Commit
1e1affd5
authored
Feb 01, 2022
by
Nikolay Igotti
Committed by
GitHub
Feb 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch Skiko to 1.8 bytecode (#467)
parent
248c4970
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
52 deletions
+2
-52
build.gradle.kts
skiko/build.gradle.kts
+2
-6
Managed.awt.kt
...src/awtMain/kotlin/org/jetbrains/skia/impl/Managed.awt.kt
+0
-46
Managed.jvm.kt
...src/jvmMain/kotlin/org/jetbrains/skia/impl/Managed.jvm.kt
+0
-0
No files found.
skiko/build.gradle.kts
View file @
1e1affd5
...
...
@@ -207,7 +207,7 @@ val Project.supportAndroid: Boolean
kotlin
{
jvm
(
"awt"
)
{
compilations
.
all
{
kotlinOptions
.
jvmTarget
=
"1
1
"
kotlinOptions
.
jvmTarget
=
"1
.8
"
}
generateVersion
(
hostOs
,
hostArch
)
}
...
...
@@ -215,7 +215,7 @@ kotlin {
if
(
supportAndroid
)
{
jvm
(
"android"
)
{
compilations
.
all
{
kotlinOptions
.
jvmTarget
=
"1
1
"
kotlinOptions
.
jvmTarget
=
"1
.8
"
}
// We need an additional attribute to distinguish between JVM variants.
attributes
{
...
...
@@ -487,10 +487,6 @@ fun configureNativeTarget(os: OS, arch: Arch, target: KotlinNativeTarget) {
}
}
tasks
.
withType
(
JavaCompile
::
class
.
java
).
configureEach
{
this
.
getOptions
().
compilerArgs
.
addAll
(
listOf
(
"-source"
,
"11"
,
"-target"
,
"11"
))
}
fun
skiaHeadersDirs
(
skiaDir
:
File
):
List
<
File
>
=
listOf
(
skiaDir
,
...
...
skiko/src/awtMain/kotlin/org/jetbrains/skia/impl/Managed.awt.kt
deleted
100644 → 0
View file @
248c4970
package
org.jetbrains.skia.impl
import
java.lang.ref.Cleaner
actual
abstract
class
Managed
actual
constructor
(
ptr
:
Long
,
finalizer
:
Long
,
managed
:
Boolean
)
:
Native
(
ptr
),
AutoCloseable
{
private
var
cleanable
:
Cleaner
.
Cleanable
?
=
null
actual
override
fun
close
()
{
if
(
0L
==
_ptr
)
throw
RuntimeException
(
"Object already closed: $javaClass, _ptr=$_ptr"
)
else
if
(
null
==
cleanable
)
throw
RuntimeException
(
"Object is not managed in JVM, can't close(): $javaClass, _ptr=$_ptr"
)
else
{
cleanable
!!
.
clean
()
cleanable
=
null
_ptr
=
0
}
}
actual
open
val
isClosed
:
Boolean
get
()
=
_ptr
==
0L
class
CleanerThunk
(
var
className
:
String
,
var
ptr
:
Long
,
var
finalizerPtr
:
Long
)
:
Runnable
{
override
fun
run
()
{
Log
.
trace
{
"Cleaning $className ${java.lang.Long.toString(ptr, 16)}"
}
Stats
.
onDeallocated
(
className
)
Stats
.
onNativeCall
()
_nInvokeFinalizer
(
finalizerPtr
,
ptr
)
}
}
companion
object
{
var
CLEANER
=
Cleaner
.
create
()
@JvmStatic
external
fun
_nInvokeFinalizer
(
finalizer
:
Long
,
ptr
:
Long
)
}
init
{
if
(
managed
)
{
assert
(
ptr
!=
0L
)
{
"Managed ptr is 0"
}
assert
(
finalizer
!=
0L
)
{
"Managed finalizer is 0"
}
val
className
=
javaClass
.
simpleName
Stats
.
onAllocated
(
className
)
cleanable
=
CLEANER
.
register
(
this
,
CleanerThunk
(
className
,
ptr
,
finalizer
))
}
}
}
\ No newline at end of file
skiko/src/
androidMain/kotlin/org/jetbrains/skia/impl/Managed.android
.kt
→
skiko/src/
jvmMain/kotlin/org/jetbrains/skia/impl/Managed.jvm
.kt
View file @
1e1affd5
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment