Skip to content

Commit

Permalink
Bump up Scaloid to 4.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
pocorall committed Apr 21, 2015
1 parent a44b0aa commit 73d5126
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 12 deletions.
4 changes: 1 addition & 3 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
android:versionCode="1"
android:versionName="1.0">

<!-- add support for the larger screens of tablets -->
<supports-screens android:largeScreens="true"
android:xlargeScreens="true" />
<uses-sdk android:targetSdkVersion="16" android:minSdkVersion="10"/>

<application android:label="@string/app_name" >
<activity android:name="HelloScaloid"
Expand Down
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Prerequisites
-------------
* sbt 0.13.5 or above
* Android build tools 20.0.0 or above
* Android SDK
- Both SDK Level 10 and the most recent version should be installed.
* Android SDK Level 16 or above
- Level 16 is required for building, while this app retains runtime compatibility from API Level 10. Please refer to `minSdkVersion` property in `AndroidManifest.xml`

Build
-----
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ proguardCache in Android ++= Seq(

proguardOptions in Android ++= Seq("-dontobfuscate", "-dontoptimize", "-keepattributes Signature", "-printseeds target/seeds.txt", "-printusage target/usage.txt"
, "-dontwarn scala.collection.**" // required from Scala 2.11.4
, "-dontwarn org.scaloid.**" // this can be omitted if current Android Build target is android-16
)

libraryDependencies += "org.scaloid" %% "scaloid" % "3.6.1-10" withSources() withJavadoc()
libraryDependencies += "org.scaloid" %% "scaloid" % "4.0-RC1" withSources() withJavadoc()

scalacOptions in Compile += "-feature"

Expand Down
4 changes: 2 additions & 2 deletions project.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Project target.
target=android-10
# Can be built with API Level 16 or higher, while this app retains runtime compatibility from API Level 10. Please refer to minSdkVersion property in AndroidManifest.xml
target=android-16
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.7
sbt.version=0.13.8
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.18")
addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.20")

addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "3.0.0")

libraryDependencies += "net.sf.proguard" % "proguard-base" % "5.0"
libraryDependencies += "net.sf.proguard" % "proguard-base" % "5.1"
2 changes: 1 addition & 1 deletion src/scaloid/example/HelloScaloid.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class HelloScaloid extends SActivity {
style {
case b: SButton => b.textColor(Color.RED).onClick(toast("Bang!"))
case t: STextView => t textSize 10.dip
case e: SEditText => e.backgroundColor(Color.YELLOW)
case e: SEditText => e.backgroundColor(Color.YELLOW).textColor(Color.BLACK)
}
STextView("I am 10 dip tall")
STextView("Me too")
Expand Down

0 comments on commit 73d5126

Please sign in to comment.