Skip to content

Commit f8b8a1c

Browse files
authored
Merge pull request #2 from AnchorFreePartner/feature/update-androidx
update annotation dependency
2 parents 519fbb9 + 548c85e commit f8b8a1c

14 files changed

+21
-19
lines changed

bolts-tasks/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ android {
1313

1414
dependencies {
1515
testImplementation 'junit:junit:4.12'
16-
implementation 'com.android.support:support-annotations:28.0.0'
16+
implementation 'androidx.annotation:annotation:1.5.0'
1717
}

bolts-tasks/src/main/java/com/anchorfree/bolts/AggregateException.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.NonNull;
13-
import android.support.annotation.Nullable;
12+
import androidx.annotation.NonNull;
13+
import androidx.annotation.Nullable;
1414
import java.io.PrintStream;
1515
import java.io.PrintWriter;
1616
import java.util.ArrayList;

bolts-tasks/src/main/java/com/anchorfree/bolts/AndroidExecutors.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import android.os.Handler;
1515
import android.os.Looper;
1616

17-
import android.support.annotation.NonNull;
17+
import androidx.annotation.NonNull;
1818
import java.util.concurrent.Executor;
1919
import java.util.concurrent.ExecutorService;
2020
import java.util.concurrent.LinkedBlockingQueue;

bolts-tasks/src/main/java/com/anchorfree/bolts/BoltsExecutors.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.anchorfree.bolts;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import java.util.Locale;
55
import java.util.concurrent.Executor;
66
import java.util.concurrent.ExecutorService;

bolts-tasks/src/main/java/com/anchorfree/bolts/CancellationToken.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.NonNull;
12+
import androidx.annotation.NonNull;
1313
import java.util.Locale;
1414
import java.util.concurrent.CancellationException;
1515

bolts-tasks/src/main/java/com/anchorfree/bolts/CancellationTokenRegistration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.Nullable;
12+
import androidx.annotation.Nullable;
1313
import java.io.Closeable;
1414

1515
/**

bolts-tasks/src/main/java/com/anchorfree/bolts/CancellationTokenSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.NonNull;
13-
import android.support.annotation.Nullable;
12+
import androidx.annotation.NonNull;
13+
import androidx.annotation.Nullable;
1414
import java.io.Closeable;
1515
import java.util.ArrayList;
1616
import java.util.List;

bolts-tasks/src/main/java/com/anchorfree/bolts/Continuation.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.Nullable;
12+
13+
import androidx.annotation.Nullable;
1314

1415
/**
1516
* A function to be called after a task completes.

bolts-tasks/src/main/java/com/anchorfree/bolts/Task.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.NonNull;
13-
import android.support.annotation.Nullable;
12+
import androidx.annotation.NonNull;
13+
import androidx.annotation.Nullable;
1414
import java.util.ArrayList;
1515
import java.util.Collection;
1616
import java.util.Collections;

bolts-tasks/src/main/java/com/anchorfree/bolts/TaskCompletionSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anchorfree.bolts;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55

66
/**
77
* Allows safe orchestration of a task's completion, preventing the consumer from prematurely

bolts-tasks/src/main/java/com/anchorfree/bolts/UnobservedErrorNotifier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.anchorfree.bolts;
22

3-
import android.support.annotation.Nullable;
3+
import androidx.annotation.Nullable;
44

55
/**
66
* This class is used to retain a faulted task until either its error is observed or it is

bolts-tasks/src/test/java/com/anchorfree/bolts/TaskTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010
package com.anchorfree.bolts;
1111

12-
import android.support.annotation.NonNull;
13-
import android.support.annotation.Nullable;
12+
import androidx.annotation.NonNull;
13+
import androidx.annotation.Nullable;
1414
import com.anchorfree.bolts.AggregateException;
1515
import com.anchorfree.bolts.CancellationToken;
1616
import com.anchorfree.bolts.CancellationTokenSource;

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ allprojects {
2121
}
2222

2323
ext {
24-
compileSdkVersion = 28
24+
compileSdkVersion = 33
2525

2626
minSdkVersion = 8
27-
targetSdkVersion = 23
27+
targetSdkVersion = 33
2828
}
2929

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
GROUP_NAME=com.parse.bolts
22
VERSION_NAME=1.4.1-SNAPSHOT
3+
android.useAndroidX=true

0 commit comments

Comments
 (0)