Browse Source

update example package

master
James Fenn 2 weeks ago
parent
commit
0df7859105
10 changed files with 22 additions and 18 deletions
  1. +7
    -6
      .gitignore
  2. +7
    -3
      build.gradle
  3. +0
    -1
      dungeon/build.gradle
  4. +1
    -0
      dungeon/src/jvmTest/kotlin/Stub.kt
  5. +1
    -1
      example-swing/build.gradle
  6. +1
    -2
      example-swing/src/main/java/me/jfenn/example/dungeonswing/CreeperScene.kt
  7. +2
    -2
      example-swing/src/main/java/me/jfenn/example/dungeonswing/Main.kt
  8. +1
    -1
      example-swing/src/main/java/me/jfenn/example/dungeonswing/SnakeScene.kt
  9. +1
    -1
      gradle/wrapper/gradle-wrapper.properties
  10. +1
    -1
      settings.gradle

+ 7
- 6
.gitignore View File

@@ -1,13 +1,14 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea
.DS_Store
/build
/captures
.externalNativeBuild
GPUCache/
.classpath
.project
.settings/
/*/bin/
/*/build/

+ 7
- 3
build.gradle View File

@@ -1,7 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.4.21'
ext.coroutines_version = '1.4.2'
ext.serialization_version = '0.20.0'

repositories {
google()
jcenter()
@@ -10,8 +13,10 @@ buildscript {
maven { url "https://kotlin.bintray.com/kotlinx" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:3.4.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -21,7 +26,6 @@ allprojects {
repositories {
google()
jcenter()
}
}



+ 0
- 1
dungeon/build.gradle View File

@@ -1,5 +1,4 @@
apply plugin: "kotlin-multiplatform"

apply plugin: 'maven-publish'
group 'dungeongl'
version '0.0.1'


+ 1
- 0
dungeon/src/jvmTest/kotlin/Stub.kt View File

@@ -0,0 +1 @@
// hi!

+ 1
- 1
example-swing/build.gradle View File

@@ -14,7 +14,7 @@ compileTestKotlin {
}
}

mainClassName = "me.jfenn.dungeon.MainKt"
mainClassName = "me.jfenn.example.dungeonswing.MainKt"

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])


example-swing/src/main/java/me/jfenn/dungeon/CreeperScene.kt → example-swing/src/main/java/me/jfenn/example/dungeonswing/CreeperScene.kt View File

@@ -1,9 +1,8 @@
package me.jfenn.dungeon
package me.jfenn.example.dungeonswing

import me.jfenn.dungeon.api.Canvas
import me.jfenn.dungeon.api.Scene
import me.jfenn.dungeon.core.color.Color.Companion.color
import me.jfenn.dungeon.core.color.RGBColor
import me.jfenn.dungeon.core.extensions.vectorOf
import me.jfenn.dungeon.core.graphics.Luminance
import me.jfenn.dungeon.core.graphics.Sprite

example-swing/src/main/java/me/jfenn/dungeon/Main.kt → example-swing/src/main/java/me/jfenn/example/dungeonswing/Main.kt View File

@@ -1,4 +1,4 @@
package me.jfenn.dungeon
package me.jfenn.example.dungeonswing

import me.jfenn.dungeon.api.dungeon
import me.jfenn.dungeon.api.env.Config
@@ -14,6 +14,6 @@ fun main() {
scalingMethod = Config.ScalingMethod.Fixed(80, 80)
//ambientLight = Color.color(100, 100, 120)
}
scene = CreeperScene()
scene = SnakeScene()
}.start()
}

example-swing/src/main/java/me/jfenn/dungeon/SnakeScene.kt → example-swing/src/main/java/me/jfenn/example/dungeonswing/SnakeScene.kt View File

@@ -1,4 +1,4 @@
package me.jfenn.dungeon
package me.jfenn.example.dungeonswing

import me.jfenn.dungeon.api.Canvas
import me.jfenn.dungeon.api.Scene

+ 1
- 1
gradle/wrapper/gradle-wrapper.properties View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

+ 1
- 1
settings.gradle View File

@@ -1 +1 @@
include ':android-sample', ':dungeon', ':example-swing'
include ':dungeon', ':example-swing'

Loading…
Cancel
Save