Skip to content

Commit

Permalink
Renamed Task package name to com.acutecoder.task.java due to package …
Browse files Browse the repository at this point in the history
…name conflict
  • Loading branch information
Bhuvaneshw committed Nov 19, 2023
1 parent 7ca402a commit bab7341
Show file tree
Hide file tree
Showing 14 changed files with 305 additions and 304 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
}

dependencies {
// implementation project(':task')
implementation 'com.github.Bhuvaneshw.task:java:1.1.5'
implementation project(':task')
// implementation 'com.github.Bhuvaneshw.task:java:1.1.5'

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/acutecoder/taskdemo/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import androidx.appcompat.app.AppCompatActivity;

import com.acutecoder.task.NextTask;
import com.acutecoder.task.OnProgress;
import com.acutecoder.task.Task;
import com.acutecoder.task.TaskCallback;
import com.acutecoder.task.TaskError;
import com.acutecoder.task.TaskResult;
import com.acutecoder.task.TaskRunnable;
import com.acutecoder.task.java.NextTask;
import com.acutecoder.task.java.OnProgress;
import com.acutecoder.task.java.Task;
import com.acutecoder.task.java.TaskCallback;
import com.acutecoder.task.java.TaskError;
import com.acutecoder.task.java.TaskResult;
import com.acutecoder.task.java.TaskRunnable;

public class MainActivity extends AppCompatActivity {

Expand Down
7 changes: 4 additions & 3 deletions app_taskkt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ android {
}

dependencies {
// implementation project(':taskkt')
implementation 'com.github.Bhuvaneshw.task:kotlin:1.1.5'
implementation 'com.github.Bhuvaneshw.task:coroutine:1.1.5'
implementation project(':taskkt')
implementation project(':taskcoroutine')
// implementation 'com.github.Bhuvaneshw.task:kotlin:1.1.5'
// implementation 'com.github.Bhuvaneshw.task:coroutine:1.1.5'

implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.1.1' apply false
id 'com.android.library' version '8.1.1' apply false
id 'com.android.application' version '8.1.3' apply false
id 'com.android.library' version '8.1.3' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Sep 04 11:25:08 IST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.acutecoder.task;
package com.acutecoder.task.java;

public class CancellationException extends RuntimeException {
public CancellationException() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.acutecoder.task;
package com.acutecoder.task.java;

public interface NextTask<T> {
Task<?> run(T result);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.acutecoder.task;
package com.acutecoder.task.java;

public interface OnProgress {
void progress(Object... progress);
Expand Down
Loading

0 comments on commit bab7341

Please sign in to comment.