Skip to content

Commit bab7341

Browse files
committed
Renamed Task package name to com.acutecoder.task.java due to package name conflict
1 parent 7ca402a commit bab7341

File tree

14 files changed

+305
-304
lines changed

14 files changed

+305
-304
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
}
3030

3131
dependencies {
32-
// implementation project(':task')
33-
implementation 'com.github.Bhuvaneshw.task:java:1.1.5'
32+
implementation project(':task')
33+
// implementation 'com.github.Bhuvaneshw.task:java:1.1.5'
3434

3535
implementation 'androidx.appcompat:appcompat:1.6.1'
3636
implementation 'com.google.android.material:material:1.9.0'

app/src/main/java/com/acutecoder/taskdemo/MainActivity.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import androidx.appcompat.app.AppCompatActivity;
99

10-
import com.acutecoder.task.NextTask;
11-
import com.acutecoder.task.OnProgress;
12-
import com.acutecoder.task.Task;
13-
import com.acutecoder.task.TaskCallback;
14-
import com.acutecoder.task.TaskError;
15-
import com.acutecoder.task.TaskResult;
16-
import com.acutecoder.task.TaskRunnable;
10+
import com.acutecoder.task.java.NextTask;
11+
import com.acutecoder.task.java.OnProgress;
12+
import com.acutecoder.task.java.Task;
13+
import com.acutecoder.task.java.TaskCallback;
14+
import com.acutecoder.task.java.TaskError;
15+
import com.acutecoder.task.java.TaskResult;
16+
import com.acutecoder.task.java.TaskRunnable;
1717

1818
public class MainActivity extends AppCompatActivity {
1919

app_taskkt/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ android {
3333
}
3434

3535
dependencies {
36-
// implementation project(':taskkt')
37-
implementation 'com.github.Bhuvaneshw.task:kotlin:1.1.5'
38-
implementation 'com.github.Bhuvaneshw.task:coroutine:1.1.5'
36+
implementation project(':taskkt')
37+
implementation project(':taskcoroutine')
38+
// implementation 'com.github.Bhuvaneshw.task:kotlin:1.1.5'
39+
// implementation 'com.github.Bhuvaneshw.task:coroutine:1.1.5'
3940

4041
implementation 'androidx.core:core-ktx:1.10.1'
4142
implementation 'androidx.appcompat:appcompat:1.6.1'

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.1.1' apply false
4-
id 'com.android.library' version '8.1.1' apply false
3+
id 'com.android.application' version '8.1.3' apply false
4+
id 'com.android.library' version '8.1.3' apply false
55
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
66
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Sep 04 11:25:08 IST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

task/src/main/java/com/acutecoder/task/CancellationException.java renamed to task/src/main/java/com/acutecoder/task/java/CancellationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.acutecoder.task;
1+
package com.acutecoder.task.java;
22

33
public class CancellationException extends RuntimeException {
44
public CancellationException() {

task/src/main/java/com/acutecoder/task/NextTask.java renamed to task/src/main/java/com/acutecoder/task/java/NextTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.acutecoder.task;
1+
package com.acutecoder.task.java;
22

33
public interface NextTask<T> {
44
Task<?> run(T result);

task/src/main/java/com/acutecoder/task/OnProgress.java renamed to task/src/main/java/com/acutecoder/task/java/OnProgress.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.acutecoder.task;
1+
package com.acutecoder.task.java;
22

33
public interface OnProgress {
44
void progress(Object... progress);

0 commit comments

Comments
 (0)