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.

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

Committing and going to sleep because I'm tired and the gradle chose … #30

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion braille/brailledisplay/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apply plugin: 'com.android.library'
apply from: "../../shared.gradle"

dependencies {
implementation project(':brailleinterfaces')
//implementation project(':brailleinterfaces')
}
2 changes: 1 addition & 1 deletion braille/brailledisplayanalytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apply plugin: 'com.android.library'
apply from: "../../shared.gradle"

dependencies {
implementation project(':braillecommon')
//implementation project(':braillecommon')
}
8 changes: 4 additions & 4 deletions braille/brailleime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apply from: "../../shared.gradle"

dependencies {
implementation project(':utils')
implementation project(':braillecommon')
implementation project(':brailleinterfaces')
implementation project(':brailleimeanalytics')
implementation project(':brailletranslate')
//implementation project(':braillecommon')
//implementation project(':brailleinterfaces')
//implementation project(':brailleimeanalytics')
//implementation project(':brailletranslate')
}
4 changes: 2 additions & 2 deletions braille/brailleimeanalytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ apply from: "../../shared.gradle"

dependencies {
implementation project(':utils')
implementation project(':braillecommon')
implementation project(':brailleinterfaces')
//implementation project(':braillecommon')
//implementation project(':brailleinterfaces')
}
8 changes: 4 additions & 4 deletions braille/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
apply from: "../../shared.gradle"

dependencies {
implementation project(':brailleinterfaces')
implementation project(':brailletranslate')
implementation project(':proguard')
implementation project(':utils')
//implementation project(':brailleinterfaces')
//implementation project(':brailletranslate')
//implementation project(':proguard')
//implementation project(':utils')
}
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ dependencies {

buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'org.aspectj:aspectjtools:1.8.1'
classpath 'com.android.tools.build:gradle:3.5.4'
classpath 'com.android.tools.build:gradle:3.6.4'
}
}

allprojects {
repositories {
jcenter()
mavenCentral()
google()
}
}
Expand All @@ -36,7 +36,8 @@ android {
applicationId talkbackApplicationId
versionName talkbackVersionName + "-" + BUILD_TIMESTAMP
minSdkVersion 26
targetSdkVersion 30
targetSdk 33
//noinspection ExpiredTargetSdkVersion
testInstrumentationRunner 'android.test.InstrumentationTestRunner'
multiDexEnabled true
}
Expand Down
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading