Skip to content

Commit

Permalink
Merge branch 'minsko-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
awlzac committed Mar 2, 2016
2 parents 7592c40 + aa87bab commit 47774d6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"
compileSdkVersion 23
buildToolsVersion "23.0.2"

defaultConfig {
applicationId "com.bulsy.wbtempest"
minSdkVersion 11
targetSdkVersion 21
versionCode 8
versionName "1.0.5"
targetSdkVersion 23
versionCode 9
versionName "1.0.6"
}
buildTypes {
release {
Expand All @@ -21,5 +21,5 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.2'
compile 'com.android.support:appcompat-v7:23.1.1'
}
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
android:installLocation="preferExternal"
>

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:allowBackup="true"
android:label="@string/app_name"
android:icon="@drawable/icon"
Expand All @@ -19,6 +20,5 @@
</intent-filter>
</activity>
</application>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

</manifest>
2 changes: 1 addition & 1 deletion app/src/main/java/com/bulsy/wbtempest/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class MainActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
try {
requestWindowFeature(Window.FEATURE_NO_TITLE);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
super.onCreate(savedInstanceState);
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.5.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.

0 comments on commit 47774d6

Please sign in to comment.