Skip to content

Commit 38365cd

Browse files
authored
Merge pull request #24 from koresframework/version/4.0.0
Version/4.0.0
2 parents 11dcd33 + 867457d commit 38365cd

File tree

317 files changed

+16897
-10303
lines changed

Some content is hidden

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

317 files changed

+16897
-10303
lines changed

.gitmodules

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
[submodule "CodeAPI"]
2-
path = CodeAPI
3-
url = https://github.com/JonathanxD/CodeAPI.git
1+
[submodule "Kores"]
2+
path = Kores
3+
url = https://github.com/koresframework/Kores.git
4+
branch = master

CodeAPI

Lines changed: 0 additions & 1 deletion
This file was deleted.

Kores

Submodule Kores added at 2e49b7c

Kores-bytecode.png

35.3 KB
Loading

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CodeAPI-BytecodeWriter - Translates CodeAPI Instructions to Bytecode!
1+
Kores-BytecodeWriter - Translates Kores Instructions to Bytecode!
22

33
The MIT License (MIT)
44

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
# BytecodeWriter [![wercker status](https://app.wercker.com/status/e90fdff200417e9ba8e472ad9d0aca23/s/master "wercker status")](https://app.wercker.com/project/byKey/e90fdff200417e9ba8e472ad9d0aca23)
2-
Translates CodeAPI structure to JVM Bytecode
1+
![Kores-BytecodeWriter](https://github.com/JonathanxD/Kores-BytecodeWriter/blob/version/4.0.0/Kores-bytecode.png?raw=true)
2+
3+
[![wercker status](https://app.wercker.com/status/e90fdff200417e9ba8e472ad9d0aca23/s/version/4.0.0 "wercker status")](https://app.wercker.com/project/byKey/e90fdff200417e9ba8e472ad9d0aca23)
4+
[![jitpack](https://jitpack.io/v/JonathanxD/Kores-BytecodeWriter.svg)](https://jitpack.io/#JonathanxD/Kores-BytecodeWriter)
5+
[![Discord](https://img.shields.io/discord/291407467286364164.svg)](https://discord.gg/3cQWmtj)

build.gradle

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,51 @@
11
buildscript {
2-
apply from: project(":CodeAPI").file('gradle/versions.gradle')
2+
apply from: project(":Kores").file('gradle/versions.gradle')
33

44
repositories {
55
mavenCentral()
66
jcenter()
7-
maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" }
87
maven { url "https://plugins.gradle.org/m2/" }
98
}
109

1110
dependencies {
1211
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1312
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
14-
classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:$license_version"
13+
classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$license_version"
1514
classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version"
1615
}
1716

1817
}
1918

2019
group 'com.github.jonathanxd'
21-
version '3.2.7-3.2.0'
20+
version '4.0.1.bytecode.1'
2221

23-
apply from: project(":CodeAPI").file("gradle/common.gradle")
22+
apply from: project(":Kores").file("gradle/common.gradle")
2423

2524
dependencies {
26-
compile project(":CodeAPI")
27-
compile 'com.github.JonathanxD:BytecodeDisassembler:2.0.3-d'
28-
compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
29-
testCompile project(path: ':CodeAPI', configuration: 'tests')
25+
// Developer note: Indev, we use this statement to compile and test BytecodeWriter.
26+
// When releasing a version of project, with git tag, we comment this statement and use compileOnly
27+
// with runtime dependency pointing to Kores published version
28+
//compile project(":Kores")
29+
compileOnly project(":Kores")
30+
runtime "com.github.JonathanxD.Kores:Kores:4.0.1.base"
31+
compile 'com.github.JonathanxD:BytecodeDisassembler:2.1.1'
32+
compile "org.ow2.asm:asm:6.0"
33+
compile "org.ow2.asm:asm-analysis:6.0"
34+
compile "org.ow2.asm:asm-tree:6.0"
35+
compile "org.ow2.asm:asm-util:6.0"
36+
37+
testCompile "com.github.JonathanxD.JwIUtils:links:$iutils_version"
38+
testCompile project(":Kores")
39+
testCompile project(path: ':Kores', configuration: 'tests')
3040
}
3141

32-
dokka {
42+
tasks.dokkaGfm.configure {
3343
enabled = false
3444
}
3545

3646
shadowJar {
3747
dependencies {
38-
include(project(":CodeAPI"))
48+
include(project(":Kores"))
3949
include(dependency("org.ow2.asm:asm-all"))
4050
include(dependency("com.github.JonathanxD:BytecodeDisassembler"))
4151
include(dependency("com.github.JonathanxD:JwIUtils"))

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
name=CodeAPI-BytecodeWriter
2-
description=Translates CodeAPI Structure to JVM Bytecode
2+
organization=TheRealBuggy/JonathanxD (https://github.com/JonathanxD/)
3+
purl=https://github.com/JonathanxD/CodeAPI-BytecodeWriter
4+
description=Translates Kores Structure to JVM Bytecode

gradle/wrapper/gradle-wrapper.jar

6.77 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Jan 02 00:35:04 BRST 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)