Skip to content

Commit

Permalink
Updated to Java 12 (Kinda)
Browse files Browse the repository at this point in the history
  • Loading branch information
RubbaBoy committed May 15, 2019
1 parent f0b5330 commit d864160
Show file tree
Hide file tree
Showing 95 changed files with 80 additions and 8,009 deletions.
24 changes: 10 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
* JFoenix for Android - [download jar](https://search.maven.org/remotecontent?filepath=com/jfoenix/jfoenix/8.0.8/jfoenix-8.0.8-retrolambda.jar)
* Released builds are available from [Maven Central](http://search.maven.org/#search%7Cga%7C1%7CJFoenix)

# Note on the fork
This fork was made to allow Java 12, and the current master goes off of the [JFoenix-9.0.0](https://github.com/jfoenixadmin/JFoenix/tree/JFoenix-9.0.0) branch of JFoenix. This is messy and there's better ways to do almost everything changed, but it works and I couldn't give two shits. This _will_ disbanded if JFoenix natively supports Java 12, though it seems like they won't, at least for the next few years.

Honestly, there's probably going to be shit broken with it and you can make a PR or something to fix it, since this is actively being used in a project.

# Using JFoenix already?
Feel free to submit your project info to the following <a href="mailto:[email protected]" target="_top">email</a>, to be posted on JFoenix github.
* One more thing, all contributions are appreciated. Don't hesitate to add your own contributions to JFoenix :)
Expand Down Expand Up @@ -59,13 +64,11 @@ If you like JFoenix :) and want to support this project, you can become a backer


# Build
To build JFoenix, execute the following command:
To build JFoenix with Java 12, I usually run the following command:

gradlew build
clean build install -x myJavadocs

To run the main demo, execute the following command:

gradlew run
There's probably a better way to do this, but this keeps it local and it works.

**NOTE** : You need to set JAVA_HOME environment variable to point to Java 1.8 directory.

Expand All @@ -87,8 +90,7 @@ repositories {
Reference the repository from this location using:
```
dependencies {
compile 'com.jfoenix:jfoenix:8.0.8' // Java 8
compile 'com.jfoenix:jfoenix:9.0.8' // Java 9
compile 'com.jfoenix:jfoenix:9.0.8-J12' // Java 12
}
```

Expand All @@ -98,13 +100,7 @@ dependencies {
<dependency>
<groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId>
<version>9.0.8</version>
</dependency>

<dependency>
<groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId>
<version>8.0.8</version>
<version>9.0.8-J12</version>
</dependency>
```
# Components
Expand Down
28 changes: 25 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@ buildscript {
mavenCentral()
}
}

plugins {
id 'com.jfrog.bintray' version '1.7.3' apply false
id 'com.github.ben-manes.versions' version '0.15.0' apply false
id 'me.tatarka.retrolambda' version '3.7.0' apply false
id 'com.github.hierynomus.license' version '0.14.0' apply false
id 'net.nemerosa.versioning' version '2.6.1' apply false
id 'org.sonarqube' version '2.5'
id 'org.openjfx.javafxplugin' version '0.0.6' apply false
id 'maven'
}

project.version = '9.0.8-J12'

subprojects {
afterEvaluate {
apply plugin: 'java'
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'net.nemerosa.versioning'
apply plugin: 'org.openjfx.javafxplugin'
apply plugin: 'maven'

// end::autoModuleName[]
repositories {
Expand All @@ -27,13 +32,28 @@ subprojects {
maven { url 'http://sevntu-checkstyle.github.com/sevntu.checkstyle/maven2' }
}

sourceCompatibility = 1.9
targetCompatibility = 1.9
sourceCompatibility = 12
targetCompatibility = 12

project.version = '9.0.8-J12'

tasks.withType(JavaCompile) {
options.incremental = true
}

configurations {
javafxCompile
}

dependencies {
javafxCompile "org.openjfx:javafx-base:12.0.1:win"
javafxCompile "org.openjfx:javafx-graphics:12.0.1:win"
javafxCompile "org.openjfx:javafx-controls:12.0.1:win"
javafxCompile "org.openjfx:javafx-fxml:12.0.1:win"

compile configurations.javafxCompile
}

// tag::autoModuleName[]
jar {
inputs.property("moduleName", moduleName)
Expand Down Expand Up @@ -65,6 +85,8 @@ subprojects {
"--add-exports=javafx.graphics/com.sun.javafx.stage=com.jfoenix",
"--add-exports=javafx.graphics/com.sun.javafx.util=com.jfoenix",
"--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=com.jfoenix",
"--add-exports=javafx.graphics/jabafx=com.jfoenix",
"--add-exports=javafx.controls/javafx.scene.control.skin=com.jfoenix",

// For various behaviors across controls
"--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix",
Expand Down
19 changes: 0 additions & 19 deletions demo/build.gradle

This file was deleted.

71 changes: 0 additions & 71 deletions demo/src/main/java/demos/MainDemo.java

This file was deleted.

55 changes: 0 additions & 55 deletions demo/src/main/java/demos/components/AlertDemo.java

This file was deleted.

Loading

0 comments on commit d864160

Please sign in to comment.