Skip to content

Commit

Permalink
Temporarily use the latest flow-noise version
Browse files Browse the repository at this point in the history 
@lukespragg Snapshots aren’t uploading, looks like travis isn’t running
the jobs.
  • Loading branch information
@DDoS
DDoS committed Jun 6, 2015
1 parent 59c311e commit d7f289b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
View file
Expand Up @@ -23,7 +23,7 @@ dependencies {
compile 'com.google.inject:guice:4.0'
compile 'ninja.leaping.configurate:configurate-hocon:1.2'
compile 'com.flowpowered:flow-math:1.0.0'
compile 'com.flowpowered:flow-noise:1.0.0'
compile 'com.flowpowered:flow-noise:1.0.1-SNAPSHOT'
compile 'org.ow2.asm:asm:5.0.3'
}

Expand Down
4 changes: 4 additions & 0 deletions gradle/java.gradle
View file
Expand Up @@ -17,6 +17,10 @@ repositories {
name = 'sponge'
url = 'http://repo.spongepowered.org/maven'
}
maven {
name = 'sonatype-nexus'
url = 'https://oss.sonatype.org/content/groups/public/'
}
}

// Testing dependencies
Expand Down

5 comments on commit d7f289b

@DarkArc
Copy link
Contributor

@DarkArc DarkArc commented on d7f289b Jun 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks builds for anyone not using

maven {
    name = 'sonatype-nexus'
    url = 'https://oss.sonatype.org/content/groups/public/'
}

@DDoS
Copy link
Contributor Author

@DDoS DDoS commented on d7f289b Jun 8, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DarkArc
Copy link
Contributor

@DarkArc DarkArc commented on d7f289b Jun 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I feel like anything which unnecessarily breaks builds, and doesn't do so intentionally (ex, a breaking API change), should not be put in master. I mean is there any reason why this couldn't have remained in a skylands branch?

@maxov
Copy link
Contributor

@maxov maxov commented on d7f289b Jun 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a quick fix by pushing a modified version of the latest flow noise jar to the Sponge maven repository (see here). I literally changed one line for it to compile to java 6 and then uploaded. That should fix issues for 99% of people for now.

I tested it with this build file:

apply plugin: 'java'

sourceCompatibility = '1.6'
targetCompatibility = '1.6'

repositories {
  mavenCentral()
  maven {
    name = 'sponge'
    url = 'https://repo.spongepowered.org/maven'
  }
}

dependencies {
  compile 'org.spongepowered:spongeapi:2.1-SNAPSHOT'
}

And it worked perfectly, see dependencies:

compile - Compile classpath for source set 'main'.
\--- org.spongepowered:spongeapi:2.1-SNAPSHOT
     +--- com.google.guava:guava:17.0
     +--- org.apache.commons:commons-lang3:3.3.2
     +--- com.google.inject:guice:4.0
     |    +--- javax.inject:javax.inject:1
     |    +--- aopalliance:aopalliance:1.0
     |    \--- com.google.guava:guava:16.0.1 -> 17.0
>>>> +--- com.flowpowered:flow-noise:1.0.1-SNAPSHOT <<<<<<<
     +--- com.flowpowered:flow-math:1.0.0
     +--- com.google.code.findbugs:jsr305:1.3.9
     +--- ninja.leaping.configurate:configurate-gson:1.2.2
     |    +--- com.google.code.gson:gson:2.2.4
     |    \--- ninja.leaping.configurate:configurate-core:1.2.2
     |         \--- com.google.guava:guava:17.0
     +--- ninja.leaping.configurate:configurate-hocon:1.2.2
     |    +--- com.typesafe:config:1.2.1
     |    \--- ninja.leaping.configurate:configurate-core:1.2.2 (*)
     +--- org.ow2.asm:asm:5.0.3
     +--- com.google.code.gson:gson:2.2.4
     \--- org.slf4j:slf4j-api:1.7.12

I agree that it was probably merged to master too presumptuously, but this fix will make it pretty much transparent for most people before I finish refactoring flow noise.

@lukespragg
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gratimax 1.0.1 is likely ready for release, but I'd check with @DDoS. If you need Java 6 compat, you could PR the change and see what the others think as well.

Please sign in to comment.