Skip to content

Commit

Permalink
Update build tools
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonydahanne committed Oct 11, 2016
1 parent c64e9a7 commit 80ff136
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 28 deletions.
32 changes: 14 additions & 18 deletions build.gradle
@@ -1,24 +1,20 @@
allprojects {
// apply plugin: 'maven'
// group = 'net.dahanne.android'
// version = '1.2.1-SNAPSHOT'
}

allprojects {

buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
}
}

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
}
}

subprojects {

repositories {
mavenCentral()
}
repositories {
mavenCentral()
}

}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon Aug 17 23:59:19 EDT 2015
#Mon Oct 10 23:22:05 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
3 changes: 1 addition & 2 deletions regalandroid/AndroidManifest.xml
Expand Up @@ -33,7 +33,6 @@
<activity android:name=".activity.ShowAlbums" android:label="@string/show_albums_title" android:configChanges="keyboardHidden|orientation"/>
<activity android:name=".activity.ShowGallery" android:label="@string/show_gallery_title" android:configChanges="keyboardHidden|orientation" />
<activity android:name=".activity.FullImage" android:label="@string/full_image_title" android:theme="@style/AppTheme" android:configChanges="keyboardHidden|orientation" />
<!--<activity android:name=".activity.FullImage" android:label="@string/full_image_title" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:configChanges="keyboardHidden|orientation" />-->
<!--<activity android:name=".activity.FirstTime" android:label="@string/firsttime_title" android:configChanges="keyboardHidden|orientation" />-->
<activity android:name=".activity.ChooseSubAlbumName" android:label="@string/choose_subalbum_name" android:theme="@android:style/Theme.Dialog" android:configChanges="keyboardHidden|orientation"/>
<activity android:name=".activity.ChoosePhotoNumber" android:label="@string/choose_photo_number_title" android:theme="@android:style/Theme.Dialog" android:configChanges="keyboardHidden|orientation" />
Expand All @@ -52,5 +51,5 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" android:resizeable="true" android:xlargeScreens="true" />
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="22"></uses-sdk>
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="16"></uses-sdk>
</manifest>
13 changes: 7 additions & 6 deletions regalandroid/build.gradle
@@ -1,16 +1,17 @@
description = 'ReGalAndroid'
apply plugin: 'android'
//apply plugin: 'android-test'
apply plugin: 'com.android.application'

android {
compileSdkVersion 10
buildToolsVersion '19.1.0'
compileSdkVersion 24
buildToolsVersion '23.0.3'
useLibrary 'org.apache.http.legacy'

defaultConfig {
minSdkVersion 10
minSdkVersion 11
targetSdkVersion 16
}
lintOptions {
checkReleaseBuilds false
abortOnError false
}
sourceSets {
Expand Down Expand Up @@ -39,5 +40,5 @@ dependencies {
exclude module: 'slf4j-api'
}
compile 'org.slf4j:slf4j-android:1.6.1-RC1'
compile 'com.android.support:appcompat-v7:22.2.+'
compile 'com.android.support:appcompat-v7:24.2.1'
}

0 comments on commit 80ff136

Please sign in to comment.