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

Partly fixed build #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Partly fixed build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
buildscript {
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:8.5.0'

}
}

Expand All @@ -15,5 +17,6 @@ subprojects {
}
repositories {
mavenCentral()
google()
}
}
8 changes: 4 additions & 4 deletions common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ android {
}

dependencies {
compile 'com.android.support:support-annotations:21.0.0'
compile 'com.google.android.gms:play-services-wearable:+'
compile 'com.jakewharton:butterknife:6.0.+'
compile 'com.jakewharton.timber:timber:2.5.+'
implementation 'com.android.support:support-annotations:21.0.0'
implementation 'com.google.android.gms:play-services-wearable:+'
implementation 'com.jakewharton:butterknife:6.0.+'
implementation 'com.jakewharton.timber:timber:2.5.+'
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Dec 01 11:14:01 EST 2014
#Sun Aug 11 20:30:35 IDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
16 changes: 8 additions & 8 deletions mobile/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
dependencies {
classpath 'com.jakewharton.hugo:hugo-plugin:1.1.+'
classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
}
}

Expand Down Expand Up @@ -64,13 +64,13 @@ android {

dependencies {
wearApp project(':wear')
compile project(':common')
compile files('libs/GLWallpaperService.jar')
compile 'com.afollestad:material-dialogs:0.3.0'
compile 'com.android.support:appcompat-v7:21.0.0'
compile 'com.google.android.support:wearable:1.1.+'
compile 'com.google.android.gms:play-services-wearable:+'
compile 'com.android.support:support-annotations:21.0.0'
implementation project(':common')
implementation files('libs/GLWallpaperService.jar')
implementation 'com.afollestad:material-dialogs:0.3.0'
implementation 'com.android.support:appcompat-v7:21.0.0'
implementation 'com.google.android.support:wearable:1.1.+'
implementation 'com.google.android.gms:play-services-wearable:+'
implementation 'com.android.support:support-annotations:21.0.0'
}

apply from: 'https://raw.github.com/twotoasters/HelloAndroidStudio/master/gradle/keystore.gradle'
8 changes: 4 additions & 4 deletions wear/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ android {
}

dependencies {
compile project(':common')
compile 'com.google.android.support:wearable:1.1.+'
compile 'com.google.android.gms:play-services-wearable:+'
compile 'com.android.support:recyclerview-v7:21.0.0'
implementation project(':common')
implementation 'com.google.android.support:wearable:1.1.+'
implementation 'com.google.android.gms:play-services-wearable:+'
implementation 'com.android.support:recyclerview-v7:21.0.0'
}

apply from: 'https://raw.github.com/twotoasters/HelloAndroidStudio/master/gradle/keystore.gradle'