Skip to content
This repository was archived by the owner on Oct 31, 2022. It is now read-only.

Commit 6fe8f8c

Browse files
committed
Fixed android build tools compile setting
* And misc clean up
1 parent 7afbf47 commit 6fe8f8c

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

build.gradle

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
buildscript {
2-
repositories {
3-
maven { url 'https://maven.google.com' }
4-
}
5-
dependencies {
6-
classpath 'com.android.tools.build:gradle:3.1.0'
7-
}
8-
}
9-
101
plugins {
112
id 'com.gradle.plugin-publish' version '0.9.10'
123
id 'java-gradle-plugin'
@@ -19,12 +10,14 @@ repositories {
1910

2011
apply plugin: 'groovy'
2112
apply plugin: 'java-gradle-plugin'
13+
apply plugin: 'java-library'
2214

2315
dependencies {
2416
compile gradleApi()
2517
compile localGroovy()
2618

27-
compile 'com.android.tools.build:gradle:3.1.0'
19+
compileOnly 'com.android.tools.build:gradle:3.1.0'
20+
testCompileOnly 'com.android.tools.build:gradle:3.1.0'
2821

2922
testCompile gradleTestKit()
3023
testCompile 'junit:junit:4.12'

src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ class GradleProjectPlugin implements Plugin<Project> {
122122

123123
static boolean didUpdateOneSignalVersion
124124

125-
// TODO: MUSTS BEFORE next release 0.8.3+
126-
// TODO: 1. Compat for VersionRangeSelector.intersect for Gradle 2.14.1 to 4.2
127-
// TODO: 2. Ensure VersionRangeSelector.accept works
128125
@Override
129126
void apply(Project inProject) {
130127
project = inProject

src/test/groovy/com/onesignal/androidsdk/MainTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class MainTest extends Specification {
254254
def "Upgrade to compatible OneSignal SDK when targetSdkVersion is 26"() {
255255
when:
256256
def results = runGradleProject([
257-
compileSdkVersion: 26, // Unexpected crash if this is 27...
257+
compileSdkVersion: 27, // Unexpected crash if this is 27 and com.onesignal:OneSignal:3.5.+
258258
compileLines : "compile 'com.onesignal:OneSignal:3.5.+'",
259259
skipGradleVersion: '2.14.1' // This check requires AGP 3.0.1+ which requires Gradle 4.1+
260260
])

0 commit comments

Comments
 (0)