Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Lift 3.5.0 + Scala 2.13 #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

WIP: Lift 3.5.0 + Scala 2.13 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4de3918
Update for Lift 3.0
lvitaly Dec 20, 2017
321c4cd
Update for Lift 3.0.1
lvitaly Dec 20, 2017
b68f13d
Update for Lift 3.0.2
lvitaly Dec 20, 2017
905dc99
Update for Lift 3.1.0
lvitaly Dec 20, 2017
b742481
Update for Lift 3.1.1
lvitaly Dec 20, 2017
936339b
Bump to Lift 3.2.0 and Scala 2.12.5
lvitaly Apr 17, 2018
e0be440
Bump to Lift 3.5.0-SNAPSHOT and Scala 2.13.3
lvitaly Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,33 @@ organization := "net.liftmodules"

version := "1.6.0-SNAPSHOT"

liftVersion := "2.6.3"
liftVersion := "3.5.0-SNAPSHOT"

liftEdition := (liftVersion apply { _.substring(0,3) }).value

moduleName := name.value + "_" + liftEdition.value

crossScalaVersions := Seq("2.11.12")
crossScalaVersions := Seq("2.13.3", "2.12.11", "2.11.12")
scalaVersion := crossScalaVersions.value.head

scalacOptions ++= Seq("-unchecked", "-deprecation")

resolvers ++= Seq(
"CB Central Mirror" at "http://repo.cloudbees.com/content/groups/public",
"Java.net Maven2 Repository" at "http://download.java.net/maven/2/"
DefaultMavenRepository,
Resolver.sonatypeRepo("public")
)

libraryDependencies ++= Seq(
"net.liftweb" %% "lift-mapper" % liftVersion.value % "provided",
"ch.qos.logback" % "logback-classic" % "1.2.3" % "provided",
"log4j" % "log4j" % "1.2.17" % "provided"
"net.liftweb" %% "lift-mapper" % liftVersion.value % Provided,
"ch.qos.logback" % "logback-classic" % "1.2.3" % Provided,
"log4j" % "log4j" % "1.2.17" % Provided
)

libraryDependencies ++= Seq(
"org.specs2" %% "specs2-core" % "3.9.1" % "test",
// "org.scalacheck" %% "scalacheck" % "1.8" % "test",
"org.apache.directory.server" % "apacheds-core" % "2.0.0-M24" % "test",
"org.apache.directory.server" % "apacheds-server-integ" % "2.0.0-M24" % "test",
"org.apache.directory.server" % "apacheds-core-integ" % "2.0.0-M24" % "test"
"org.specs2" %% "specs2-core" % "4.9.4" % Test,
"org.apache.directory.server" % "apacheds-core" % "2.0.0.AM26" % Test,
"org.apache.directory.server" % "apacheds-server-integ" % "2.0.0.AM26" % Test,
"org.apache.directory.server" % "apacheds-core-integ" % "2.0.0.AM26" % Test
)

fork in Test := true
fork in Test := true
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.4
sbt.version=1.3.13
15 changes: 6 additions & 9 deletions src/main/scala/net/liftweb/ldap/LDAP.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@
* limitations under the License.
*/

package net.liftweb {
package ldap {
package net.liftweb.ldap

import java.io.{InputStream, FileInputStream}
import java.util.{Hashtable, Properties}
import java.util.Properties

import javax.naming.{AuthenticationException, CommunicationException, Context}
import javax.naming.directory.{Attributes, SearchControls}
import javax.naming.ldap.InitialLdapContext

import scala.collection.mutable.ListBuffer
import scala.collection.JavaConversions._

import _root_.net.liftweb.util.{ControlHelpers, Props, SimpleInjector, ThreadGlobal}
import _root_.net.liftweb.common.{Box, Empty, Full, Loggable}
Expand Down Expand Up @@ -57,7 +55,7 @@ object SimpleLDAPVendor extends LDAPVendor {
}

@deprecated("Use the configure() method")
def setupFromBoot = configure()
def setupFromBoot(): Unit = configure()
}

/**
Expand Down Expand Up @@ -313,7 +311,9 @@ class LDAPVendor extends Loggable with SimpleInjector {
}

protected def propertiesToMap(props: Properties) : Map[String,String] = {
Map.empty ++ props
val builder = Map.newBuilder[String, String]
props.forEach((k,v) => builder.addOne((k.toString, v.toString)))
builder.result()
}

// =========== Code ====================
Expand Down Expand Up @@ -444,6 +444,3 @@ class LDAPVendor extends Loggable with SimpleInjector {
new InitialLdapContext(env, null)
}
}

}} // Close nested packages

Loading